Initial commit
Merge branch 'master' of http://github.com/shellthor/angular-app1 into develop