style edit
style edit
style edit
style edit
style edit
bcbc
work
Merge branch 'master' of https://github.com/SerendipityNL/Doctopus

Conflicts:
	beta/002/public/css/ui.css