Merge branch 'master' into feature
bootstrap...
Added some views
Start building out OAuth