Adjusting repository structure after splitout of autotest.
Adjusting Vagrant and moving files to autotest repro.

Conflicts:

	reset_db.sh
Merge branch 'branch-1-0'

Conflicts:
	ngeo_browse_server/config/browselayer/decoding.py
	ngeo_browse_server/config/browselayer/parsing.py
	ngeo_browse_server/config/browsereport/decoding.py
	ngeo_browse_server/config/browsereport/parsing.py
	ngeo_browse_server/control/control/__init__.py
	ngeo_browse_server/control/management/__init__.py
	ngeo_browse_server/control/queries.py
	ngeo_browse_server/control/views.py
	ngeo_browse_server/decoding.py
	ngeo_browse_server/mapcache/__init__.py
	ngeo_browse_server/ngeo_browse_server/config/browselayer/parsing.py
	ngeo_browse_server/ngeo_browse_server/config/browsereport/parsing.py
	ngeo_browse_server/ngeo_browse_server/control/management/__init__.py
	ngeo_browse_server/ngeo_browse_server/mapcache/__init__.py
	ngeo_browse_server/ngeo_browse_server/parsing.py
	ngeo_browse_server/ngeo_browse_server/project_template/project_name/__init__.py
	ngeo_browse_server/ngeo_browse_server/project_template/project_name/data/failure/DO-NOT-REMOVE
	ngeo_browse_server/ngeo_browse_server/project_template/project_name/data/optimized/DO-NOT-REMOVE
	ngeo_browse_server/ngeo_browse_server/project_template/project_name/data/storage/DO-NOT-REMOVE
	ngeo_browse_server/ngeo_browse_server/project_template/project_name/data/success/DO-NOT-REMOVE
	ngeo_browse_server/ngeo_browse_server/project_template/project_name/logs/DO-NOT-REMOVE
	ngeo_browse_server/parsing.py
	ngeo_browse_server/project_template/project_name/__init__.py
	ngeo_browse_server/project_template/project_name/data/failure/DO-NOT-REMOVE
	ngeo_browse_server/project_template/project_name/data/optimized/DO-NOT-REMOVE
	ngeo_browse_server/project_template/project_name/data/storage/DO-NOT-REMOVE
	ngeo_browse_server/project_template/project_name/data/success/DO-NOT-REMOVE
	ngeo_browse_server/project_template/project_name/logs/DO-NOT-REMOVE
	shares/httpd/www_root/html/DO-NOT-REMOVE
	vagrant/shares/httpd/www_root/html/DO-NOT-REMOVE
Adjustments for new directory structure.
Update Vagrant to 1.3.5.
Various adjustments for new directory structure.
Further work on vagrant adjustments.
Further vagrant adjustments.
Merge branch 'branch-1-0'

Conflicts:
	vagrant/shares/httpd/www_root/cache/mapcache.xml
Once again vagrant.
Merge branch 'branch-1-0'
Still vagrant.
Merge branch 'branch-1-0'
Once again vagrant.
Merge branch 'branch-1-0'
Merge pull request #4 from EOX-A/master

Merging changes derived from merge of branch-1-0 from forked ngeo repository