#6, #7: Added first menu and status bar items.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/view/Frame.java