taskbar icons, bugfix for diagnose add
webapp refactored
Merge branch 'master' of https://github.com/jarig/dogy

Conflicts:
	WebApp/booking/db_config.php