found bugz buny
Merge branch 'master' of https://github.com/WeHeartGaming/Codename-WHIRC

Conflicts:
	WHIRC/src/no/whg/whirc/activities/MainActivity.java