20pm
Merge branch 'requirejs-integration' of https://github.com/NaturalSolutions/ecoReleve-Data into requirejs-integration

Conflicts:
	assets/css/styles.css
	assets/less/styles.less
	index.html
	styles.css.map