Fixed overlapping ui elements, some asset modifications
Merge branch 'master' of github.com:Maduiini/derelictfactory

Conflicts:
	src/Application.cpp