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

Conflicts:
	KwisT/platforms/ios/www/js/quiz.js