Merge branch 'branch-1-0' into branch-controller-IF

Conflicts:
	install_ngeo_browse_server.sh
Merge branch 'branch-1-0' into branch-controller-IF

Conflicts:
	ngeo_browse_server/config/browselayer/parsing.py
	ngeo_browse_server/config/browsereport/parsing.py
	ngeo_browse_server/ngeo_browse_server/config/browselayer/decoding.py
	ngeo_browse_server/ngeo_browse_server/config/browselayer/parsing.py
	ngeo_browse_server/ngeo_browse_server/config/browsereport/decoding.py
	ngeo_browse_server/ngeo_browse_server/config/browsereport/parsing.py
	ngeo_browse_server/ngeo_browse_server/decoding.py
	ngeo_browse_server/ngeo_browse_server/parsing.py
	ngeo_browse_server/parsing.py
Merge branch 'master' into branch-controller-IF

Conflicts:
	reset_db.sh