Updated directory structure for gradle support
Added gradle wrapper
Merge branch 'develop'