Merge branch 'master' of https://github.com/ging/vish into vish-b3
Add avatars to activity objects.
icon lock center
Minor enhance.
Bug fixed on file management for Scormfiles and Webapps
adjusts admin, new session..
Merge branch 'vish-b3' of https://github.com/ging/vish into vish-b3
fix conflicts