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

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/BF8/110/sprockets%2Fa7782b0842287420332c80f3e8766376
	tmp/cache/assets/C32/AB0/sprockets%2F30b0a8116cf53f7745681e6388873748
	tmp/cache/assets/C35/610/sprockets%2F747c58317547994db0c840f4a7401899
	tmp/cache/assets/C48/2E0/sprockets%2F60ee55530423231916c9b1678442bbb7
	tmp/cache/assets/C95/D60/sprockets%2F47de96f8245350599739e46c3612ce3b
	tmp/cache/assets/CC5/910/sprockets%2F5098ef5914d179f93a479c4d31ce5652
	tmp/cache/assets/CC8/690/sprockets%2Fb5fc3669ff690ef78aa6688342329712
	tmp/cache/assets/CDD/0B0/sprockets%2F6a28e6384b6da8f9740af05a168342b0
	tmp/cache/assets/CE3/2D0/sprockets%2F30f69a64b39a16aeb1ef141728589c82
	tmp/cache/assets/CE8/830/sprockets%2F1b5e714286b6bc17528efe62b69715f3
	tmp/cache/assets/CEB/370/sprockets%2F55b42a391201fead77879a58b96a938b
	tmp/cache/assets/CF7/D00/sprockets%2F7eb70eb277854ee6759176b0c44928fe
	tmp/cache/assets/CFC/930/sprockets%2Fa98debf569918322dc4ef468761268d6
	tmp/cache/assets/D09/4C0/sprockets%2Ff94267b1703f4d6b55ea27b38fe1a014
	tmp/cache/assets/D12/170/sprockets%2F8c5435860ddd80b9220a7f4a429c4fc7
	tmp/cache/assets/D13/690/sprockets%2F9adf39e761c7f8a038b60457311f53da
	tmp/cache/assets/D17/060/sprockets%2F73f0509f90d91fcd8c224d4f9c12f076
	tmp/cache/assets/D2A/F70/sprockets%2Fc7349e001a6f0805deff271b602c0c2c
	tmp/cache/assets/D35/1F0/sprockets%2F989fcbd3455d4d425325f0ab12d1b4a6
	tmp/cache/assets/D35/B20/sprockets%2F28ac00d61dc805de45142d7cb1b3e798
	tmp/cache/assets/D3B/730/sprockets%2F2a3fdc06d326b9e8bb363bf671d31467
	tmp/cache/assets/D3E/4C0/sprockets%2F7414e3e12942a56ae96fe5d373b0b8bc
	tmp/cache/assets/D48/D70/sprockets%2F7f6668125e2e48cc54aae2cc5808f2f4
	tmp/cache/assets/D66/410/sprockets%2Fffc9d77054294305e799cef56ff869ea
	tmp/cache/assets/D6D/060/sprockets%2F1b7d900ce8b8db3656f8446d41cc12ce
	tmp/cache/assets/D74/520/sprockets%2Fca86d886eaa56773c7c41bbb23af8562
	tmp/cache/assets/D77/140/sprockets%2Ffefd5054e565f6193a819b1b09fbeb19
	tmp/cache/assets/D81/6A0/sprockets%2F88c4ac0ffe3482b8a21d657d7bf569d9
	tmp/cache/assets/D88/390/sprockets%2F8d5d698c47d8df64bbb26506f89c74bb
	tmp/cache/assets/DD1/5B0/sprockets%2F5f685acbb75faf30613d6ee644f07acf
	tmp/cache/assets/E04/2C0/sprockets%2Fa20b4618ffd7ac9de84b7d7c73dfb90a
	tmp/cache/assets/E06/F10/sprockets%2Ff7ca5fcf22c8681fb5eb0b7ca448d8a9