1. Add tab panel.
Merge branch 'master' of https://github.com/cobble19/takeaway.git

Conflicts:
	src/main/resources/jdbc.properties