gradle file updated
Merge branch 'feature_contentList' of https://github.com/questmaster/FATpRemote into feature_contentList

Conflicts:
	build.gradle
Merge branch 'feature_contentList' of https://github.com/questmaster/FATpRemote into feature_contentList

Conflicts:
	build.gradle