Merge branch 'feature/1-UserAccountModels' into develop

Conflicts:
	Alpha/My Project/AssemblyInfo.vb