Testing merge

Testing merge
Merge branch 'master' of https://github.com/thejamesbrown/core

Conflicts:
	Ui/ManagementUi/mainwindow.cpp