els removed. templates slightly modified.
Merge branch 'master' of https://github.com/colus001/CCMS