p2 mod
Merge branch 'S1985sisa' of github.com:laszlosisa/angular-seed into S1985sisa