new and modified files for my part
Merge branch 'master' of github.com:tcase360/restaurant2

Conflicts:
	app/controllers/archivedorders.js
	app/models/ArchiveOrders.js
	config/routes.js
	public/js/config.js