Merge branch 'master' of https://github.com/jjf28/HabitatConfig

Conflicts:
src/main/client/ConfigOptions.java