Update build.gradle and gradle-wrapper.properties
Merge branch 'iftekhar_features' of https://github.com/Apptitive/Ma-o-Shishu into iftekhar_features

Conflicts:
	gradle/wrapper/gradle-wrapper.properties