HTML5 URLs activated
reload problems solved
Merge remote-tracking branch 'origin/master' into HTML5_URLs

Conflicts:
	static/js/findeco.app.js