get rid of unncessary "mainline" stuff
fixed merge conflict in #process_inclusion
minor optimization of #all_roles
fixed #forgot_password cardlessness
made recaptcha use https.  need to recompile assets...
cleanup of ok_view
comment and whitespace only
Merge branch 'mainhandle' into formatclean
fixed standard (packed) image updating
Merge branch 'formatclean' into develop
compacted item_ids
removed invalid custom attribs from card slot wrappers
strip HTML from inclusion syntax
fixed data-slot copying
fixed migration typo
Merge branch 'strip_inclusion' into develop
Merge branch 'validhtml' into develop
wiped old assets away
re-precompiled assets
emergency slot handling patch