ok
Merge branch 'master' of https://github.com/ulrikmoe/scanpay

Conflicts:
	css/main.css