update devbranch
Merge branch 'master' of https://github.com/camwhite/hackathon into medev
exposing languages and translations to angular
Merge pull request #7 from camwhite/medev

Medev