OAuth
Merge branch 'master' into kitchen
angular update
Merge branch 'master' of github.com:sachac/quantified