Merge branch 'hotfix-1.5.4'
fix topic parameters
use increment_counter to update hit
bump version to 1.5.4.1
Merge branch 'hotfix-1.5.4.1'
fix parameters for users
move lib/assets & vendor/assets to app/assets
bump version to 1.5.4.2
Merge branch 'hotfix-1.5.4.2' into 2.0-dev

Conflicts:
	app/controllers/topics_controller.rb
	config/initializers/version.rb