Revert "Update PSM Date and Time to be Selectable Instead of Text"
Merge pull request #4470 from TryGhost/revert-4448-master

Revert "Update PSM Date and Time to be Selectable Instead of Text"
Upgrading Casper to 1.1.2
Fix issue with editor and images

ref #4459

- move initMarkers back to its original home
- add new test that a post with an image can be edited
Merge pull request #4473 from ErisDS/editor-fix

Fix issue with editor and images
Fixing logic for editors deleting themselves

no issue
- no user is allowed to delete their own account
Merge pull request #4474 from ErisDS/profilefix

Fixing logic for editors deleting themselves
Version bump to 0.5.4
Merge branch 'master' of https://github.com/TryGhost/Ghost

Conflicts:
	content/themes/casper