p1
Merge branch 'S12342_fix' of github.com:gaboom/angular-seed into S12342_fix