Merge branch 'hotfix/terminator-init'
Merge branch 'release/0.0.2'
lock wiki at 0.0.5
Merge branch 'hotfix/0.0.3'
Merge branch 'hotfix/0.0.3' into develop
use wiki from openshift branch on github paul90/wiki
 - pegs version of express to avoid the problems with latest express version.
Merge branch 'hotfix/0.0.3' into develop