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

Conflicts:
	app/build.gradle