Add view bookings button for supervisor
Merge branch 'master' of github.com:jacobtardieu/MinesTravel

Conflicts:
	src/main/webapp/WEB-INF/views/users/admin.jsp