Minor changes
Error Handler Added
Merge branch 'ErrorHandler' into marius
Merge pull request #2 from tavaron/patrick

Patrick
Controller, Callback-Timer and first parts of GUI added
Merge pull request #3 from tavaron/marius

Marius
Nearly compiled :)
Minor Bugfixes
Update Model.cpp
Update Model.cpp
finished error handler
finished error handler
fixed syntx error
...
finished callback functionality
Merge pull request #6 from tavaron/marius

Marius
after using merge tool
conflicts
conclicts solved
added errors to error map, debug output, fixed compiler errors