Merge remote-tracking branch 'origin/master'

Conflicts:
	citizen_main/src/com/app/citizen/MainActivity.java