cleaned up indentation for plugin settings page
cleaned up indentations in main
Merge branch '1.3.5'