Add odata support
Add menu item for shift table
Add menu items
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/navigation.json