Merge branch 'hotfix/asset_comp'
Merge branch 'release/v0.1.10'
Merge branch 'release/v0.2.0'
asset compilation
updated rails
ruby version files
merge conflict
precomp assets
static secret token
secret token changes
Merge branch 'master' into develop