Manage Router - in progress (and removeTourAction deleted)
Merge branch 'master' of https://github.com/esd-soft-eng/server

Conflicts:
	MuseumServer/nbproject/ant-deploy.xml
Manage Router - In Progress 14:30 090313 - Update