Merge pull request #53 from Gef4K/dev

Floating toolBox instead of fixed toolBox
changed toolbox shortcut and added another fix for the colour picker
updated build
rebuilt javadocs
Merge pull request #2 from HeroesGrave/dev