Merge branch 'master' of https://github.com/chenboxing/portal

Conflicts:
	app/controllers/nodes_controller.rb
	app/helpers/custom_fields_helper.rb
	db/development.sqlite3