-
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/truthgame/LoginActivity$1.class
	bin/classes/com/truthgame/LoginActivity.class
	bin/classes/com/truthgame/MainActivity$PlaceholderFragment.class
	bin/classes/com/truthgame/MainActivity$SectionsPagerAdapter.class
	bin/classes/com/truthgame/MainActivity.class
	bin/classes/com/truthgame/ProfileActivity.class
	bin/classes/com/truthgame/adapters/MoreListAdapter.class
	bin/classes/com/truthgame/fragments/MoreFragment.class
	bin/classes/com/truthgame/fragments/ProfileFragment.class
	bin/classes/com/truthgame/fragments/Rulesfragment.class
	bin/classes/com/truthgame/logic/GameLogic.class
	bin/classes/com/truthgame/logic/QuestionMaker.class