201309111536
201309111611

1.move some useless style sheet and js to other folder
201309111622
Merge branch 'Eric2-20130911' into develop

Conflicts:
	app/controllers/records_controller.rb
	app/views/devise/registrations/edit.html.erb
	app/views/team_users/_carousel.html.erb
	app/views/welcome/teamList.html.erb
	db/development.sqlite3
	log/development.log
	log/sunspot-solr-development.log
	solr/data/development/index/_0.fdt
	solr/data/development/index/_0.fdx
	solr/data/development/index/_0.frq
	solr/data/development/index/_0.nrm
	solr/data/development/index/_0.prx
	solr/data/development/index/_0.tis
	solr/data/development/index/_1.fdt
	solr/data/development/index/_1.tis
	solr/data/development/index/segments_3
	solr/pids/development/sunspot-solr-development.pid
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/pids/server.pid