added waypoints menu item
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/WEB-INF/views/trip/masterpage_tripmenu.jsp
added waypoints menu item