Mapping into correct templates + some small bugs.
Merge branch 'master' of https://github.com/syslabcom/osha.hwccontent