Update gradle plugin
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
Fix nullpointer issue with gender in User.java