HTTP Lib - make singleton work

Was not actually enforcing a singleton
Split the create shortcode page into subpages

Separate creating shortcode template into a separate page from creating
shortcodes.
Merge remote-tracking branch 'origin/gsr' into gsr