Merge branch 'master' of https://github.com/haptear/APIJSON.NET

# Conflicts: # APIJSON.NET/APIJSON.NET.sln # APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj # APIJSON.NET/APIJSON.NET/Controllers/JsonController.cs # APIJSON.NET/APIJSON.NET/Services/IdentityService.cs # APIJSON.NET/APIJSON.NET/Startup.cs # APIJSON.NET/APIJSON.NET/wwwroot/js/main.js # APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj

Author: haptear