devel version created
Merge branch 'devel'

Conflicts:
	VERSION