20130905

delete_all_data
201309051842

胖子修正錯誤連結
20130905
Merge branch 'Andy' of https://github.com/nt46/Imagic into Andy

Conflicts:
	db/development.sqlite3
	log/development.log
201309061432

圖片縮圖
圖片上傳
搜尋
201309061444

搜尋可以英文＋中文
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