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