Fixes to XML import feature
Merge branch 'master' into devel
Removed unused settings for App object
Ran some templates through HTML/JS prettifier
Removed unused code