Merge "Updated the .gitignore"
-rw-r--r-- 953 .gitignore
drwxr-xr-x - extlibs
drwxr-xr-x - resource
drwxr-xr-x - service
drwxr-xr-x - tools