S0613_FIX_2
Merge branch 'S0623' of github.com:ipuppyp/angular-seed into S0623