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 'branch-1-0'

Conflicts:
	ngeo_browse_server/control/ingest/__init__.py
Merge branch 'branch-1-0'

Conflicts:
	ngeo_browse_server/__init__.py
	ngeo_browse_server/control/testbase.py
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.
Merge branch 'branch-1-0'
Adjusting ngeo-b_add_browse_layers.sh
Merge branch 'branch-1-0'

Conflicts:
	ngeo-b_autotest
Merge branch 'branch-1-0'
Merge branch 'branch-1-0'
Merge branch 'branch-1-0'

Conflicts:
	ngeo_browse_server/__init__.py
Merge branch 'branch-1-0'
Merge branch 'branch-1-0'

Conflicts:
	ngeo_browse_server/__init__.py
	ngeo_browse_server/control/management/commands/ngeo_delete.py
Minor adjustments in the ngeo.conf template and submodule update.
Adding links to new interfaces to index template.
Adjusting EOxServer installation.
Merge branch 'master' into branch-controller-IF

Conflicts:
	reset_db.sh
Adding model changes to be able to create a complete mapcache XML config file.