20140621
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/zuma/common/HomeActivity.class
	bin/classes/com/zuma/sql/GetActivitybyCount.class
	bin/classes/com/zuma/syn/DologinTask.class