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

Conflicts:
	quax/src/quax.js
co-occurrences