Merge branch 'development' of github.com:Indholdskanalen/indholdskanalen into development
Moved API to use REST in both controllers anf angular factories
Resoved merge conflict