Merge branch 'master' of https://github.com/mfportzert/Quizz-Places

Conflicts:
	src/com/quizz/places/activities/QuizzActivity.java
	src/com/quizz/places/fragments/MenuFragment.java
Merge branch 'master' of https://github.com/mfportzert/Quizz-Places.git