cleanup, code style fixes, doc part I
Merge branch 'master' of https://github.com/webdesigner97/collabportal