New Function Comments
Merged on 3-6-2013
Merge branch 'master' of https://github.com/m-as/contentManagment