Change level messages, add question count

Update the current level messages to be more motivating.
Add a question count directive with the text 'x of y questions'.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	angular_webApp/src/app/practiceGame/common/practice.directive.js
	angular_webApp/src/app/practiceGame/custom-practice/customPractice.ctrl.js
	angular_webApp/src/app/practiceGame/custom-practice/customPractice.tpl.html
Add the 'SPR' option in the respective controllers

Add the switch option for 'SPR' questions in the question.ctrl that is
used for the individual question view
Merge branch 'master' of https://github.com/mlopez-firstfactory/maua into mlopez-firstfactory-master

Conflicts:
	angular_webApp/src/app/practiceGame/common/practice.service.js
Merge branch 'mlopez-firstfactory-master'