next version
next version
next version
new
Merge branch 'devel'

Conflicts:
	VERSION
tralalalala
something in a tracked file
Merge branch 'master' into devel

Conflicts:
	VERSION