changes
Merge branch 'saxswaxs' of https://github.com/stmudie/scatterBrain into saxswaxs

Conflicts:
	as__saxsimagegui__define.pro
	as_frameobj__define.pro