Updated userlines in datamanager
Updated userlines in datamanager
Merge branch 'origin/master'

Conflicts:
	workspace/enwida/pom.xml
Merge branch 'origin/master'

Conflicts:
	workspace/enwida/pom.xml
merge updates