201309241908

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

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/pids/server.pid