201309051855

1.「賽事紀錄」，修正無編輯權限時，點選檢視連結錯誤
2.「單場紀錄」(Record.index)，「返回按鈕」，若未登入修正為:back,有登入則反回賽事紀錄首頁
201309061249

1.賽事記錄，命中率顯示修正
2.權限修正
Merge branch 'Eric' into develop
20130906

1.修正Game權限(new,edit,update)
2.修正Record權限(new,edit,update)
3.修正Player權限(new,edit,update)
Merge branch 'statusLevel' into Eric
Merge branch 'Eric' into develop
Merge branch 'Andy' into develop
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	app/controllers/records_controller.rb
	app/controllers/team_users_controller.rb
	app/views/team_users/_carousel.html.erb
	db/development.sqlite3
	log/development.log
	tmp/pids/server.pid
201309100232

Facebook welldone & merge completed
Merge branch 'develop' into Rogi
201309100935
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	tmp/pids/server.pid
201309100951

clean up the conflict msg
Merge branch 'Rogi' into develop
201309100955

clean up the conflict msg
201309101215

let the current user also can login with his/her fb account nd
integrate with the current local account
201309101221

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

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
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