Angular f/Editing
Merge branch 'master' of https://github.com/jdehlin/MatrixApi

Conflicts:
	MatrixApi/Matrix/controllers.js