Merge branch 'master' into develop
add individual emails for travis notification
Merge branch 'develop' of https://github.com/wattdepot/wattdepot into develop
Updated the package structure and JavaDocs.
Forgot 2 JavaDoc updates.
Bumped version to 3.0.0-M2.
Merge branch 'release-3.0.0-M2'
Merge branch 'master' into develop
Another package shuffle.
Bumped version to 3.0.0-M3
Merge branch 'release-3.0.0-M3'
Merge branch 'master' of https://github.com/wattdepot/wattdepot