Model classes are added.
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/build.gradle
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Fix gradle plugin version gradle-wrapper.properties
Add Registration screen. Add values folders.