Various improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/burntpizza/attractive/Main.java