Merge pull request #8 from ridiekel/master

Bugfixes and dimmer support
Merge pull request #9 from ridiekel/master

Added timeout
Merge pull request #10 from ridiekel/master

Added WebSocket support
Merge pull request #11 from ridiekel/master

Added test server implementation
Enabled production flag in TDSClient connection.
Merge branch 'master' of https://github.com/xhibit/Teletask-api

Conflicts:

backend/client/src/main/java/be/xhibit/teletask/client/TeletaskClient.ja
va
	webapps/html5/src/main/webapp/index.jsp
Revert "Merge branch 'master' of https://github.com/xhibit/Teletask-api"

This reverts commit bfedfa8ef431f7ed2993117c0306feca3d600538, reversing
changes made to 8c25862486b61624d585a508bc3005d8145da09d.
Revert 34e345a..84bcabf

This rolls back to commit 34e345a527485ed03985f381a8e8db59a72df7e1.
Revert bfedfa8..0a5825d

This rolls back to commit bfedfa8ef431f7ed2993117c0306feca3d600538.
Fixed merge conflicts.
Removed duplicate logging.
Merge pull request #12 from ridiekel/master

Fixed Micros issue
Merge remote-tracking branch 'xhibit/master'
Fixed merge issue