Further porting to Qt Widget

Still some event issues
Merge branch 'master' of https://github.com/mkacz91/apricot

Conflicts:
	Apricot.pro
	src/core/core.pri
	src/main/main.cpp