ff
Merge branch 'master' of https://github.com/Kwis-t/Mobile-App

Conflicts:
	KwisT/platforms/android/res/xml/config.xml
	KwisT/platforms/ios/cordova/console.log
	KwisT/platforms/ios/www/js/quiz.js
	KwisT/www/js/quiz.js