commit first stage
Merge branch 'master' of github.com:Preffer/smart-campus-android

Conflicts:
	.gitignore