Merge branch 'release/v1.1.0' into develop
Fix php errors when assets field is empty
Move Json_Template to its own file, fix WSOD on plugins page
Bump version number, change log
Merge branch 'release/v1.1.1'