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
Adding custom configuration to vagrant.
Adding UUID to optimized filename in order to support ingestion of different browses with same filename.
Merge branch 'branch-1-0'

Conflicts:
	ngeo_browse_server/control/ingest/__init__.py
Adjusting version.
Adjusting manifest.
Adjusting tests for filename including UUID.
Adjusting previous commit.
Removing test after adding UUID to filename.
Adjusting release procedure.
Adjusting gitignore.
Further addition.
Merge branch 'branch-1-0'

Conflicts:
	ngeo_browse_server/__init__.py
	ngeo_browse_server/control/testbase.py
Updating submodule.
Merge branch 'branch-1-0'

Conflicts:
	ngeo-b_autotest
Adding vagrant howto for windows.
Merge pull request #12 from v-manip/windows_update_2

Adding vagrant howto for windows.
Moving add_browse_layers.sh from ngeo-b_autotest repository to ngeo-b_add_browse_layers.sh and adding it to installation.
Merge branch 'branch-1-0'