Merge branch 'devel', checking version against github
v1.0.3
Merge branch 'devel'

Conflicts:
	log.txt
Merge branch 'devel'
Merge branch 'master' into devel
log version v1.1.1