touched log.properties
Merge branch 'develop' of https://github.com/wattdepot/wattdepot into develop
Merge branch 'develop' of https://github.com/wattdepot/wattdepot into develop
Trying to get selenium tests to work. They don't