sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/abdulet/megacounter/MainActivity.java