Updated database creation script
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps
Changes for dev server
Merge branch 'master' of https://github.com/NERC-CEH/ecomaps

Conflicts:
	ecomaps/websetup.py