started on taxonomy admin
Update rails
Merge branch 'master' of github.com:pkordel/snl_admin
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	lib/snl_admin/version.rb
	snl_admin.gemspec