CSS regen
Code cleanup
Safer increment of created items
Merge remote-tracking branch 'upstream/master'