Removed create_title_bar from ui.h
Removed titlebar functions from ui.h
Removed statusbar functions from ui.h
Tidied new headers, added defines
Removed inputwin functions from ui.h
Merge branch 'master' into plugins

Conflicts:
	Makefile.am
	src/server_events.c