couter_cache readonly
Merge pull request #1627 from loomio/rails4_migration_break

couter_cache readonly
minor language update
redirect /timeline
ok usa
change cucumber default formatter
Merge branch 'master' into following

Conflicts:
	config/cucumber.yml
put image dependencies into the assets
expire assets
whoops
rejig assets
bump assets again
does this change anything\?
ok
test
Merge branch 'master' into following

Conflicts:
	config/initializers/assets.rb
ya
ok