Merge branch 'master' of https://github.com/MokiMobility/ng-boilerplate-client-modules into moki

Conflicts:
	bower.json
Merge branch 'master' of https://github.com/j-walker23/ng-boilerplate-client-modules into moki