Merge branch 'dev' of https://github.com/franzm/shatrabase
Merge branch 'dev' of https://github.com/franzm/shatrabase
Merge branch 'master' of https://github.com/franzm/shatrabase
updated sboard.cpp
Merge branch 'master' of https://github.com/franzm/shatrabase

Conflicts:
	resources.qrc
merging
Merge branch 'master' of https://github.com/franzm/shatrabase
Merge branch 'master' of https://github.com/franzm/shatrabase