fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	applr.js
	src/Templates/QuestionOption.html
	src/config.js
rebuild applr
small fixes
Merge pull request #3 from dmitriydzyuba/master

applr