Fixed the angular build process. Comleting unit tests next
Merged conflicts
Fixed unit tests for base controller.