fixed listview stuffies in GameActivity, or something
Merge branch 'master' of https://github.com/joethered/clarp

Conflicts:
	res/layout/fragment_main.xml