UI oopdated!

now with menus!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/application.cpp