20131841huang
Merge branch 'master' of https://github.com/nt46/Imagic

Conflicts:
	db/development.sqlite3
	db/production.sqlite3
	log/development.log
	public/assets/application-1709bded19c31d9d80a51f6464d7bc12.js.gz
	public/assets/application-a841dcac87c445acd182968dbce3f896.js.gz
	public/assets/application-ed44978cb9c8f11c7a6d99c7fd426dff.css
	public/assets/application-ed44978cb9c8f11c7a6d99c7fd426dff.css.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/manifest.yml
	public/uploads/team_user/avatar/2/2_HeadIcon2.jpg
	tmp/cache/assets/BF8/110/sprockets%2Fa7782b0842287420332c80f3e8766376
	tmp/cache/assets/C2C/AF0/sprockets%2F911090d327332a3b0720b1b0212e179e
	tmp/cache/assets/C32/AB0/sprockets%2F30b0a8116cf53f7745681e6388873748
	tmp/cache/assets/C35/610/sprockets%2F747c58317547994db0c840f4a7401899
	tmp/cache/assets/C48/2E0/sprockets%2F60ee55530423231916c9b1678442bbb7
	tmp/cache/assets/C83/640/sprockets%2F3233432f81669b9bd10ef726c526d348
	tmp/cache/assets/C8F/5C0/sprockets%2F73a8e965179a187694d474ab9e0a5233
	tmp/cache/assets/C91/BC0/sprockets%2F84de45b759f8e71000a8c991e4637175
	tmp/cache/assets/CB7/160/sprockets%2F935c1657a89ceb65442b4013e7fc1298
	tmp/cache/assets/CC1/020/sprockets%2F406d70d04010e2c501241e04a97ffa4e
	tmp/cache/assets/CC5/910/sprockets%2F5098ef5914d179f93a479c4d31ce5652
	tmp/cache/assets/CC6/2D0/sprockets%2Fe7740f3835f88b10f82a6e135d96859c
	tmp/cache/assets/CC6/680/sprockets%2Fc92f033b739ce130682844ed8e69578f
	tmp/cache/assets/CC8/690/sprockets%2Fb5fc3669ff690ef78aa6688342329712
	tmp/cache/assets/CD0/AB0/sprockets%2F2211190fb757d05874e2b25fc37a31ad
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/CD9/190/sprockets%2Fe44b8ea9a8b6a5122c36482208d196a2
	tmp/cache/assets/CDA/4C0/sprockets%2F2eb17025608aa1945fd9c83546c17bd2
	tmp/cache/assets/CDD/0B0/sprockets%2F6a28e6384b6da8f9740af05a168342b0
	tmp/cache/assets/CDF/CF0/sprockets%2F4753b01ef3692e44d7e521c6792ab2e4
	tmp/cache/assets/CE1/D40/sprockets%2F31e3423b898584304691269aa4fbaece
	tmp/cache/assets/CE2/AD0/sprockets%2Fbd71546009ab5e606b3f27b4c6a79856
	tmp/cache/assets/CE3/2D0/sprockets%2F30f69a64b39a16aeb1ef141728589c82
	tmp/cache/assets/CE3/DF0/sprockets%2Fe25a52095738056a868c2dce17def351
	tmp/cache/assets/CE8/830/sprockets%2F1b5e714286b6bc17528efe62b69715f3
	tmp/cache/assets/CED/D00/sprockets%2F2a6d70186146cf3fc2788f724d39ea66
	tmp/cache/assets/CF6/540/sprockets%2Ff6888c398e7db3483934f1bd73b831d2
	tmp/cache/assets/CF7/D00/sprockets%2F7eb70eb277854ee6759176b0c44928fe
	tmp/cache/assets/CFC/930/sprockets%2Fa98debf569918322dc4ef468761268d6
	tmp/cache/assets/D04/0B0/sprockets%2F9512b592fa6c75ce622249a0c18aa21f
	tmp/cache/assets/D09/4C0/sprockets%2Ff94267b1703f4d6b55ea27b38fe1a014
	tmp/cache/assets/D09/E80/sprockets%2Fd36082dad29a1db8964c7ed45301c435
	tmp/cache/assets/D0B/DB0/sprockets%2Fb84c213cd2b359b91bf0647e3c3e3638
	tmp/cache/assets/D12/170/sprockets%2F8c5435860ddd80b9220a7f4a429c4fc7
	tmp/cache/assets/D13/690/sprockets%2F9adf39e761c7f8a038b60457311f53da
	tmp/cache/assets/D14/540/sprockets%2F02903259d5d86a4ece7e0550a98cc6f3
	tmp/cache/assets/D17/060/sprockets%2F73f0509f90d91fcd8c224d4f9c12f076
	tmp/cache/assets/D1F/CF0/sprockets%2F0a5ec700ac1e9666397a8e2ae798675f
	tmp/cache/assets/D22/0D0/sprockets%2Fa035acbc266c313b1957b2e850a70a3b
	tmp/cache/assets/D28/2B0/sprockets%2Fbd0a440cae4c73a294953f7500ae0f13
	tmp/cache/assets/D2C/DC0/sprockets%2F3783b388f70e09f9d73b5e718ea89b8a
	tmp/cache/assets/D30/8A0/sprockets%2F323d5be22db41d6f2ae253d275618fd0
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D32/D70/sprockets%2F942fde70014811f40fb47ab1cd681ea5
	tmp/cache/assets/D35/1F0/sprockets%2F989fcbd3455d4d425325f0ab12d1b4a6
	tmp/cache/assets/D35/920/sprockets%2F0d8467c92fec2930e6b2aa0a02685e5a
	tmp/cache/assets/D35/B20/sprockets%2F28ac00d61dc805de45142d7cb1b3e798
	tmp/cache/assets/D37/BE0/sprockets%2Fe96b6d41003adcd8931ceae05c089713
	tmp/cache/assets/D3A/B80/sprockets%2F737b891c9d4a2c31370beebcc1693f13
	tmp/cache/assets/D3B/730/sprockets%2F2a3fdc06d326b9e8bb363bf671d31467
	tmp/cache/assets/D3E/4C0/sprockets%2F7414e3e12942a56ae96fe5d373b0b8bc
	tmp/cache/assets/D3F/9A0/sprockets%2F050079b7589aeab8c295f71e2ce6da12
	tmp/cache/assets/D44/200/sprockets%2F27047ebd13645febfa67a9331c98a47d
	tmp/cache/assets/D44/980/sprockets%2Fbb6dea6557018a8503c976fd50c88db2
	tmp/cache/assets/D48/D70/sprockets%2F7f6668125e2e48cc54aae2cc5808f2f4
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D50/230/sprockets%2Fc32375a2ee84cf849ab9cf4639c73b75
	tmp/cache/assets/D55/E60/sprockets%2Fee234ce2a1830ba3aa17b5ba348e6803
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D5F/AF0/sprockets%2Ffb44e73a3bf9b7b2a82af0a29401363c
	tmp/cache/assets/D66/410/sprockets%2Fffc9d77054294305e799cef56ff869ea
	tmp/cache/assets/D6C/700/sprockets%2Fbb274c8f97160cfe2d3cb254016dac98
	tmp/cache/assets/D6C/D20/sprockets%2F06b9d1558ba54534daf1fd82d9f1d5a2
	tmp/cache/assets/D6C/E70/sprockets%2Fa25743adc787a0dee4017ed8246c9ae2
	tmp/cache/assets/D6D/D90/sprockets%2F6e60bfc6c3b304996f9ef741cec0101e
	tmp/cache/assets/D6E/7C0/sprockets%2F6d3d91ee7d874756a64de5e2abd012b1
	tmp/cache/assets/D6F/6E0/sprockets%2Ff15c03effb31e671b1d6697865b0a2ff
	tmp/cache/assets/D73/280/sprockets%2F07288ed78ff2acf03b31a328dea38d68
	tmp/cache/assets/D74/520/sprockets%2Fca86d886eaa56773c7c41bbb23af8562
	tmp/cache/assets/D77/140/sprockets%2Ffefd5054e565f6193a819b1b09fbeb19
	tmp/cache/assets/D77/470/sprockets%2F188aff13e457e71f033e68da59cfe5b0
	tmp/cache/assets/D7F/490/sprockets%2F2a01500dd26fbf2c0674f0eddee530a0
	tmp/cache/assets/D81/6A0/sprockets%2F88c4ac0ffe3482b8a21d657d7bf569d9
	tmp/cache/assets/D85/EF0/sprockets%2F4dfd88e36fdc6b91aa78946dc62907f1
	tmp/cache/assets/D88/390/sprockets%2F8d5d698c47d8df64bbb26506f89c74bb
	tmp/cache/assets/D89/BA0/sprockets%2F70ebacade5405a55d3b5225da31b6e38
	tmp/cache/assets/D8A/300/sprockets%2F0e6474aeb0db22d170e5e0af5e4c2d54
	tmp/cache/assets/D8F/A90/sprockets%2F95256bf9b405fce0f2aecf110ac25c34
	tmp/cache/assets/D96/140/sprockets%2F2cd2bb9006b4ec5b85bd668270d3ab7f
	tmp/cache/assets/D98/620/sprockets%2F69735ca84ab511abbe681591db8dbbc3
	tmp/cache/assets/D9A/F50/sprockets%2F68429f8bbcdd24281d5dd3d0bf93da11
	tmp/cache/assets/DA3/5F0/sprockets%2Fa50b370fc234d6e2e9ae5ceff8a91873
	tmp/cache/assets/DA5/390/sprockets%2Fc6934bffbcca878449245d0a6ae590fa
	tmp/cache/assets/DAC/970/sprockets%2Fae4189928bf19c53df5c09e0adaaf878
	tmp/cache/assets/DB3/450/sprockets%2Fbf1a1eea22236ee7fc5c0d12a931cb33
	tmp/cache/assets/DBD/550/sprockets%2Fbdf81d3b0ebcf47b000e0bd8850ed535
	tmp/cache/assets/DD1/5B0/sprockets%2F5f685acbb75faf30613d6ee644f07acf
	tmp/cache/assets/DD3/8C0/sprockets%2F6af25879eeffe4881a2d0ae09eea51d0
	tmp/cache/assets/DD6/060/sprockets%2F8cc37c9ef73700cd4ff90ce4c20ce74f
	tmp/cache/assets/DD7/B50/sprockets%2Fe490aa67ba81ce0dc9f545bd584ff72f
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DDC/D00/sprockets%2Fd718f6f85f022c0cacc9d88c69ddd3b6
	tmp/cache/assets/DF4/C90/sprockets%2Fdba4ab8c4eb94e704ee3f1bb9a2285d0
	tmp/cache/assets/DF8/CC0/sprockets%2Fd0f688f674dece6bbc3e2b0d3c4114af
	tmp/cache/assets/DFA/290/sprockets%2F22a206dcfded52c9e6c3b5aca6c3e778
	tmp/cache/assets/E04/2C0/sprockets%2Fa20b4618ffd7ac9de84b7d7c73dfb90a
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E06/F10/sprockets%2Ff7ca5fcf22c8681fb5eb0b7ca448d8a9
	tmp/cache/assets/E0F/BB0/sprockets%2Fcaa35da89d1f0bbad42ff983778f7e8f
	tmp/cache/assets/E5C/FE0/sprockets%2F9e755dff2afc262bbdc1cbd8cd414cd7
	tmp/cache/assets/E85/DF0/sprockets%2Fdfc635d1c2ab5cb53dc9da2d7eed3cf3
	tmp/pids/server.pid