Merge branch 'master' into dev
Create phpunit.xml
readme typo, updated .gitignore, svn update 1.0.0

.gitignore ignores .svn folders now
bugfix to assign default color to marker, restructuring code
Merge branch 'dev'