fixed angular merge issue
Merge branch 'fix-angular-break' of github.com:makersquare/clicker