Emergency bugfix
Merge branch 'develop'
Merge branch 'master' into cordova

Conflicts:
	server/prerender/index.js