small changes
Merge branch 'master' of https://github.com/MTG/sms-tools

Conflicts:
	software/models/harmonicModel.py
	software/models/sineModel.py
	software/models/sineModelAnal.py