v0.1 31 december 2012
v0.1 31 december 2012
Merge pull request #1 from urbanlink/develop

Develop to Master
Merge pull request #1 from urbanlink/develop

Develop to Master
Merge branch 'refs/heads/develop'

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>

Conflicts:
	.gitignore
Merge branch 'refs/heads/develop'

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/urbanlink/columby
Merge pull request #12 from urbanlink/develop

Live version 0.1.1
.
Merge branch 'develop' of https://github.com/columby/columby-cms into develop
Drupal postGIS settings page to see if CMS is connected to postGIS database