priorityAction :)
Merge branch 'master' of github.com:q42jaap/magic-client

Conflicts:
	js/magic-layout.js
pass on priorityAction werkt
priorityQuestion in aparte file