Many improvements to markup-editor
Added watermark to markup
Fixed 'dev' parameter
Simplified boolean requests
Made loading any markup more robust