Automatic incremental saving of user model
Windows version of command
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	user/Activities.xml