done
Merge branch 'master' of https://github.com/OdeToCode/ndc_oslo_angularjs