Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Merge branches 'dev' and 'master'
Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Adds cleanup for capistrano plus asset precompilation
Merge branches 'master' and 'dev' into dev