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 'master' of https://github.com/urbanlink/columby