UI changes
Merge branch 'master' of https://github.com/ashuven63/Wikiaudia

Conflicts:
	logfile
UI changes
merged allocation
UI changes
Added recent UI changes