Merge branch 'dev' of https://github.com/m13253/sawroeg into dev

Conflicts:
	divide.py
new sawguq.py again
Merge branch libertas/dev into dev

Conflicts:
	divide.py