bundle update
Merge branch 'master' of github.com:ckruse/cforum

Conflicts:
	Gemfile.lock
bundle update (after silly merge)
moved from a buggy gem solution to a home brewed, but working JS l10n solution