Fixed buttons not displaying
Merge branch 'master' of https://github.com/Wittyshare/wittyshare

Conflicts:
	src/WsModules/WsModPdf/src/WsModPdf.cpp
Merge branch 'master' of https://github.com/Wittyshare/wittyshare
Removed double canvas (merge problem)