Merge branch 'master' of http://121.37.232.241:10101/r/HRI
# Conflicts:
# .gitignore
# PPMX.Entity/obj/Debug/PPMX.Entity.csproj.AssemblyReference.cache
# PPMX.Logic/bin/Debug/PPMX.Logic.dll
# PPMX.Logic/bin/Debug/PPMX.Logic.pdb
# PPMX.Logic/obj/Debug/PPMX.Logic.csproj.AssemblyReference.cache
# PPMX.Logic/obj/Debug/PPMX.Logic.dll
# PPMX.Logic/obj/Debug/PPMX.Logic.pdb
# PPMX.Utility/obj/Debug/PPMX.Utility.csproj.AssemblyReference.cache
# PPMX.Web/bin/PPMX.Logic.dll
# PPMX.Web/bin/PPMX.Logic.pdb
# PPMX.Web/bin/PPMX.Web.dll
# PPMX.Web/bin/PPMX.Web.pdb
# PPMX.Web/obj/Debug/PPMX.Web.csproj.AssemblyReference.cache
# PPMX.Web/obj/Debug/PPMX.Web.dll
# PPMX.Web/obj/Debug/PPMX.Web.pdb