bugfix
Merge branch 'master' of Marc-Anthony:Explee/EdmodoBundle