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

Conflicts:

KwisT/platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimula
tor/CordovaLib.build/CordovaLib.dep

KwisT/platforms/ios/build/KwisT.build/Debug-iphonesimulator/KwisT.build/
KwisT.dep
	KwisT/platforms/ios/build/emulator/KwisT.app/www/js/quiz.js