develfile
Merge branch 'devel'

Conflicts:
	devel/develfile
consistent repository
consistent repository with folders
new start
changes to devel