test
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
Registration and update of user complete
First rebuilding milestone completed
First rebuilding milestone completed
Cleaning structure
imagd upload done first version
some refinements
Refinements