add better merge for sln and csproj file
Merge branch 'json_serializer' of github.com:Vandborg/SW505E14-Software into json_serializer