removed changes
Merge branch 'dev' of https://github.com/ichub/CollaborationBoard into dev