clean up
Merge branch 'dev' of github.com:skapator/WP-Simple-Settings-Framework into dev
Clean up