Merge branch 'master' of https://github.com/gilbox/angular-fluxish-experiment