Working on uploading images to pages
Merge branch 'develop' of https://github.com/TacoDeWolff/Dex into develop
Simplified inline pages editing, conforming to code style; ident using tabs
Removed unnecessary menu item deletion, happens in modify_menu already
Slightly more concise
Cleanup conflicts; to tab indentation; moved template logic to template
Script inclusion check bugfix