Merge branch 'development' of git@github.com:jmagic/configurator.git into development
Line wrap cleanup
Removing unused code
Merge branch 'development' of git@github.com:jmagic/configurator.git into development