3dmarkers
3dmarkers
shit
conflicts

Conflicts:
	.gitignore
	crestyl/app/config/local/database.php
Merge branch 'dev' of https://github.com/VizioArt/dock into dev