Merge branch 'develop' - conversion of ng controllers to ModelService complete
Merge branch 'master' into develop