Updated routes so server no longer requires reboot
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/router.js