Updated gradle scripts + minor project files.
Merge branch 'develop'