fixed listing, no ajax yet
Merge branch 'ajax'

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