Test restructuring
Merge branch 'dev' into mark

Conflicts:
	freeeed/settings.properties