simplify translations tag generation
add default order by locale
update development dependencies
change controller hierarchy so it inherits from host application controller to have access to the helpers of the host app (mainly 'current_user')
fix line height for translations edit view
Merge branch 'master' into rails-3

Conflicts:
	Gemfile.lock
	app/controllers/i18nline/application_controller.rb