Adding model changes to be able to create a complete mapcache XML config file.
Adding config parsing capabilities for new config params to specify the ingestion strategy.
Version is not supported in bdist_rpm requires.
Adding preprocessing functionality to ngeo browse server. Adding dataset merging facilities.
Merge branch 'branch-1-1' of github.com:EOX-A/ngeo-b into branch-1-1

Conflicts:
	ngeo_browse_server/__init__.py
Adding abstract test class and concrete test for ingestion merging.
Fixing typo and bug for timespan parsing.
Adding merging configs to default config.
Fixing error in models: choices list.
Bug hunting in dataset merging and surrounding code.
Properly implementing merging in ingestion.
Fixing models tile query limit with default value.
Cleanup.
Added missing imports. Added file cleanup for previous image after merge.
Adding default configuration for merging. Specifying new browse report to trigger merge.
Making new merging behaviour the default. adapting default configuration.
Update to new autotest version.
Merge branch 'branch-1-0' into branch-1-1
Merge branch 'branch-1-1' of github.com:EOX-A/ngeo-b into branch-1-1
Merge branch 'branch-1-1'

Conflicts:
	ngeo_browse_server/__init__.py
	ngeo_browse_server/control/tests.py