XSS fixes
Merge branch 'origin/proc_static_nav'
Merge branch 'xss'

Conflicts:
	lib/rails_admin/config/fields/base.rb