ready for merge
Merge branch 'master' of github.com:waterwaves/angular-seed