changes when I logged on
Merge branch 'testing' of https://github.com/ProjectNexus/nexus into testing

Conflicts:
	log/development.log
	tmp/pids/server.pid
trying to fix conflicts