Merge branch 'release/demo-alpha'
getting the new colorpicker integrated
merge
small modifications to the html
Merge branch 'master' into dev
adjusting javascript code after some of the sass rewrite
getting the demo to work as it should with a dialog window
tests for the last commit have now been added
merge
fixing a duplicated div that happened on the last commit