primera versión de la api
ajuste
Merge branch 'dev' into dev_javier_api
ajuste
Merge pull request #3 from GeographicaGS/dev_raul

Dev raul
Merge pull request #4 from GeographicaGS/dev_raul

Bug fixes
Merge pull request #5 from GeographicaGS/dev_raul

Dashboard and forum links fixes
Fix show Youtube controls on preview
micro_blog
micro blog
Merge branch 'dev' into dev_javier_api
Merge branch 'dev_javier_api' into dev_javier_blog
Merge branch 'dev_raul' into dev
Merge branch 'dev_javier_blog' into dev
Merge with dev branches
Added groups controls to teacheradmin