adding files removed in 534a9c5 + some formating
Merge branch 'develop' of https://github.com/UnifiedViews/Plugins into develop