Getting ready to merge angular.
Merge branch 'master' of https://github.com/rainabba/santadodge

Merge angular code.