use main view
updated MainContentView and MainSidebarView
Merge branch 'master' into hendrik

Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/swing/view/DishView.java
before merge with master shaun's master
Merge branch 'master' into hendrik
MainContentView populate with dishes
Merge branch 'master' into hendrik
adding 10 toasts, weeee
scroll scroll scroll
updated the layout of the main window
Merge branch 'hendrik'