First round manual scaffolding
First round manual bower magic
Merge branch 'develop'

* develop:
  First round manual bower magic
  First round manual scaffolding