IntelliJ stupid naming bugs
Merge remote-tracking branch 'origin/postmvp' into postmvp
Merge remote-tracking branch 'origin/postmvp' into postmvp
Merge remote-tracking branch 'origin/postmvp' into postmvp
Merge remote-tracking branch 'origin/postmvp' into postmvp
Merge remote-tracking branch 'origin/postmvp' into postmvp
Merge remote-tracking branch 'origin/postmvp' into postmvp
Merge remote-tracking branch 'origin/postmvp' into postmvp
Remaining XML Integration for COC