Fix an error when exiting
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Disable mouse when aborted
Minor fix
Update termprop
Merge branch 'develop'

Conflicts:
	sskk/canossa
Update termprop
Merge branch 'master' into develop