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
201309111626
test
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	app/controllers/team_users_controller.rb
20130912
201309121854

Conflicts:
	db/development.sqlite3
	tmp/pids/server.pid
20130912
201309122006
201309141727
201309171053
201309171110

1.teamUser左列寬度修正
201309171111

不重要的log, tmp
Merge branch 'Eric3-20130914'

Conflicts:
	app/controllers/team_users_controller.rb
	db/development.sqlite3
	log/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.frq
	solr/data/development/index/_1.nrm
	solr/data/development/index/_1.prx
	solr/data/development/index/_1.tis
	solr/data/development/index/segments_3
	solr/data/development/spellchecker/segments_1
	solr/pids/development/sunspot-solr-development.pid
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D0B/DB0/sprockets%2Fb84c213cd2b359b91bf0647e3c3e3638
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D44/200/sprockets%2F27047ebd13645febfa67a9331c98a47d
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D6C/E70/sprockets%2Fa25743adc787a0dee4017ed8246c9ae2
	tmp/cache/assets/DB3/450/sprockets%2Fbf1a1eea22236ee7fc5c0d12a931cb33
	tmp/cache/assets/DDC/D00/sprockets%2Fd718f6f85f022c0cacc9d88c69ddd3b6
	tmp/pids/server.pid