Activities upload
Merge branch 'master' of https://github.com/marcgc21/GSOC14-LG_InteractiveSpaces