support user
Merge branch 'develop' of https://github.com/cloverstudio/Spika-Android into develop

Conflicts:
	src/com/cloverstudio/spikademo/utils/Const.java