Start integration of edit crisis
Merge branch 'master' of github.com:wiiwcvl/nuitinfo2014