201309100935
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	tmp/pids/server.pid