commit q before merge
Merge branch 'master' of https://github.com/aberke/quiz-widgets into wenting

Conflicts:
	app/static/widget/q.js
	app/static/widget/widget.css
commit before pull
merged alex code