Bootstrap, index.jp changes
Merge branch 'master' of https://github.com/simoncomputing/Ghost

Conflicts:

target/m2e-wtp/web-resources/META-INF/maven/simoncomputing.app/Ghost/pom
.properties