fix
delete
Merge remote-tracking branch 'origin/master'

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