QT4 -> QT5
Merge branch 'master' of https://github.com/SpelaOman/BubiLink into SpelaOman-master

Conflicts:
	BubiLink.pro.user

Resolution:
	Delete file from cache and merge.