hd
Merge branch 'master' of https://github.com/codurs/Truffle-Gourmet-Android

Conflicts:
	.idea/libraries/ActiveAndroid.xml
	build/intermediates/dex-cache/cache.xml