Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties
	src/com/chemart/comers/MainActivity.java