?
Merge branch 'master' of https://github.com/malikba/geocine

Conflicts:
	js/main.js
	manifest.webapp