Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' of heroku.com:stackables
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
temp fix: leave concatenated client.js in lib...

folder until can figure out why build is not
working on live server.
Merge branch 'master' into dev