Add custom sort order for duty positions, cleanup of options in uninstall script
Added upload handler from original CAPWATCH script
Add shortcodes include