fixes merge issues
Merge branch 'f-roadmap-2013' of github.com:Invenietis/ck-certified into f-roadmap-2013