Merge branch 'master' of ssh://github.com/tbodt/jswerve

Conflicts:
jswerve-api/src/main/java/com/tbodt/jswerve/Website.java
fix conflicts