Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into nursery-dev

.eslintrc.json

@@ -28,6 +28,7 @@
 		}
 	},
 	"rules": {
+		"semi": ["error", "always"],
 		"semi-spacing": "warn",
 		"semi-style": "warn",
 		"eqeqeq": "error",
@@ -36,6 +37,7 @@
 		"no-nested-ternary": "warn",
 		"no-unneeded-ternary": "error",
 		"camelcase": "warn",
+		"padded-blocks": ["error", "never"],
 		"comma-spacing": "error",
 		"comma-style": "error",
 		"object-curly-newline": ["warn",