Morning commits
Updated Tasks
Merge Conflict resolution
Merge branch 'testing' of https://github.com/ProjectNexus/nexus into testing

Conflicts:
	tmp/pids/server.pid