Merge remote-tracking branch 'devel/update_travis'
Merge remote-tracking branch 'devel/update_travis'
Fix string comparison for travis
Merge remote-tracking branch 'devel/update_travis'
Merge remote-tracking branch 'devel/update_travis'

Conflicts:
	.travis.yml
Version updated
Merge branch 'update_version_number' into devel