fixed gradle.xml
Merge branch 'master' of https://github.com/raycoarana-mns/hackathonglass

Conflicts:
	.idea/gradle.xml
Added json