Merge changes I56f29eac,Ic7530d44
-rw-r--r-- 381 .gitignore
drwxr-xr-x - extlibs
drwxr-xr-x - resource
drwxr-xr-x - service
drwxr-xr-x - tools