added class header and fixed indentation of actions and hooks
Merge branch 'master' into develop
added function headers