merge complete
Merge remote-tracking branch 'origin/placeline' into placeline

Conflicts:
	bin/PlaceLine.apk
	bin/classes.dex
	bin/resources.ap_