update
Merge branch 'master' of https://github.com/mrhack/mapei

Conflicts:
	js/main.js