no message
Merge branch 'dev-master' of https://github.com/Bitizen/CounterSwipe into dev-master

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/com/bitizen/counterswipe/AvailableMatchesActivity.class
fixing lobby/start