201310231107

change:some log
Merge branch 'master' of https://github.com/nt46/Imagic

Conflicts:
	log/development.log