201309100935
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	tmp/pids/server.pid
Merge branch 'Rogi' into develop
201309100955

clean up the conflict msg
201309101221

let the current user can also login with his/her fb account and
integrate with the local current account as well
201309101800

球員尚未認證成功就會出現在名人榜的圖片上
搜尋放進welcome/teamList裡面
teaminfo的id改成gid
201309101808

remove the "change pwd" column if user login through fb account.

and use a button to show up the "change pwd" column in normal cases
Merge branch 'Andy' into develop

Conflicts:
	app/controllers/team_users_controller.rb
	log/development.log
	tmp/pids/server.pid
201309111332
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	app/controllers/team_users_controller.rb
	db/development.sqlite3
	log/development.log
	log/sunspot-solr-development.log
	solr/data/development/index/_1.fdt
	solr/data/development/index/_1.fdx
	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.gen
	solr/pids/development/sunspot-solr-development.pid
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/pids/server.pid
201309111337
201309111404

FIX SOLR
Merge branch 'develop' into Rogi

Conflicts:
	db/development.sqlite3
	log/development.log
	log/sunspot-solr-development.log
	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.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/pids/server.pid
201309121818
201309121845