null checks added
Merge branch 'bootstrap3' of https://github.com/j-walker23/ng-boilerplate-client-modules into bootstrap3