test
Merge branch 'master' of https://github.com/rupnikj/qmapp

Conflicts:
	alex/src/test.js