Fixed entry edit bugs during lunch
Fixed image loading stuff
Fixed weird Firefox bug that stopped submit being triggered on forms
Fixed merge conflicts
Fixed test suite