Merge branch 'release/v1.1.0' into develop
Merge branch 'master' into develop
messy moving
removed bootstrap that's handled manually. moved js to app directory
setup brunch to create a vendor.js, app.js and app.css from the site-specific and bower components
Merge branch 'feature/package-management' into develop
new temp design
bumping version
adding static data
Merge branch 'release/v0.3.0-temp-new-design'