Fixed bug with Admin UI and creating sensors.
Merge branch 'develop' of https://github.com/wattdepot/wattdepot into develop
Updated License information.
Fixed checkstyle problem with WattDepotClient
Fixing the SharkCollector to use the right default port.
Improved the test coverage for WattDepotClient.
add travis config
Can now enable logging to file or just to console.
Fixed merge issues from master.
Bumped ver to 3.0.0-M1
Merge branch 'release-3.0.0-M1'