segment-views
fix admin edit
Merge branch 'working-branch'

Conflicts:
	app/assets/javascripts/xforum/forum_basic.js.coffee
	app/models/xforum/language.rb
	app/views/xforum/admin_lists/_category_set.html.erb
	app/views/xforum/admin_lists/_topic_set.html.erb
	app/views/xforum/admin_users/_admin_users.html.erb