Formatting, and included directory_selector fix
Merge branch 'git' of github.com:SoftwareDev/Markus into git