Merge remote-tracking branch 'origin/Users_UnitTesting'

Conflicts:
ImmoEx/MvcWebRole1.Tests/ImmoE.Tests.csproj
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: ImmoEx/ImmoEx.MongoDB.Identity/IdentityUser.cs
# modified: ImmoEx/ImmoEx.MongoDB.Identity/UserStore.cs
# new file: ImmoEx/ImmoEx.UsersManagements.Tests/Helpers/Others.cs
# new file: ImmoEx/ImmoEx.UsersManagements.Tests/Helpers/TestUserStore.cs
# new file:
ImmoEx/ImmoEx.UsersManagements.Tests/ImmoEx.UsersManagement.Tests.csproj
# new file:
ImmoEx/ImmoEx.UsersManagements.Tests/ManageUsersControllerTests.cs
# new file: ImmoEx/ImmoEx.UsersManagements.Tests/Properties/AssemblyInfo.cs
# new file: ImmoEx/ImmoEx.UsersManagements.Tests/UsersControllerTests.cs
# new file: ImmoEx/ImmoEx.UsersManagements.Tests/app.config
# new file: ImmoEx/ImmoEx.UsersManagements.Tests/packages.config
# modified: ImmoEx/ImmoEx.sln
# deleted:
ImmoEx/MvcWebRole1.Tests/Controllers/Agency/AgencyControllerTest.cs
# modified: ImmoEx/MvcWebRole1.Tests/Controllers/Agency/AgencyProcessTest.cs
# modified: ImmoEx/MvcWebRole1.Tests/ImmoE.Tests.csproj
# modified:
ImmoEx/MvcWebRole1/Controllers/Agency/AgencyAdmin/AgencyUsersAdmin.cs
# modified: ImmoEx/MvcWebRole1/Controllers/Agency/AgencyController.cs
# modified: ImmoEx/MvcWebRole1/ImmoEx.csproj
# modified: ImmoEx/MvcWebRole1/packages.config
# new file:
ImmoEx/packages/Microsoft.AspNet.Identity.Core.2.2.1/Microsoft.AspNet.Identity.Core
.2.2.1.nupkg
# new file:
ImmoEx/packages/Microsoft.AspNet.Identity.Core.2.2.1/lib/net45/Microsoft.AspNet.Ide
ntity.Core.xml
# new file:
ImmoEx/packages/Microsoft.AspNet.Identity.EntityFramework.2.2.1/Microsoft.AspNet.Id
entity.EntityFramework.2.2.1.nupkg
# new file:
ImmoEx/packages/Microsoft.AspNet.Identity.EntityFramework.2.2.1/lib/net45/Microsoft
.AspNet.Identity.EntityFramework.xml
# deleted:
ImmoEx/packages/Microsoft.AspNet.Identity.Owin.2.2.0/Microsoft.AspNet.Identity.Owin
.2.2.0.nupkg
# deleted:
ImmoEx/packages/Microsoft.AspNet.Identity.Owin.2.2.0/lib/net45/Microsoft.AspNet.Ide
ntity.Owin.dll
# new file:
ImmoEx/packages/Microsoft.AspNet.Identity.Owin.2.2.1/Microsoft.AspNet.Identity.Owin
.2.2.1.nupkg
# renamed:
ImmoEx/packages/Microsoft.AspNet.Identity.Owin.2.2.0/lib/net45/Microsoft.AspNet.Ide
ntity.Owin.xml ->
ImmoEx/packages/Microsoft.AspNet.Identity.Owin.2.2.1/lib/net45/Microsoft.AspNet.Ide
ntity.Owin.xml
# new file: ImmoEx/packages/Moq.4.2.1502.0911/Moq.4.2.1502.0911.nupkg
# new file: ImmoEx/packages/Moq.4.2.1502.0911/lib/net35/Moq.xml
# new file: ImmoEx/packages/Moq.4.2.1502.0911/lib/net40/Moq.xml
# new file: ImmoEx/packages/Moq.4.2.1502.0911/lib/sl4/Moq.Silverlight.xml
# new file: ImmoEx/packages/Newtonsoft.Json.6.0.4/Newtonsoft.Json.6.0.4.nupkg
# new file:
ImmoEx/packages/Newtonsoft.Json.6.0.4/lib/net20/Newtonsoft.Json.xml
# new file:
ImmoEx/packages/Newtonsoft.Json.6.0.4/lib/net35/Newtonsoft.Json.xml
# new file:
ImmoEx/packages/Newtonsoft.Json.6.0.4/lib/net40/Newtonsoft.Json.xml
# new file:
ImmoEx/packages/Newtonsoft.Json.6.0.4/lib/net45/Newtonsoft.Json.xml
# new file:
ImmoEx/packages/Newtonsoft.Json.6.0.4/lib/netcore45/Newtonsoft.Json.xml
# new file: ImmoEx/packages/Newtonsoft.Json.6.0.4/lib/portable-
net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml
# new file: ImmoEx/packages/Newtonsoft.Json.6.0.4/lib/portable-
net45+wp80+win8+wpa81/Newtonsoft.Json.xml
# new file: ImmoEx/packages/Newtonsoft.Json.6.0.4/tools/install.ps1
# modified: ImmoEx/packages/repositories.config
# modified:
Libraries/ImmoexFunctionsLibrary/ImmoexFunctionsLibrary/ImmoexFunctionsLibrary.cspr
oj
# modified:
Libraries/ImmoexFunctionsLibrary/ImmoexFunctionsLibrary/packages.config
#