Moved conversion of formmanager config from array to Config object to the getter instead of the setter. And some code cleanup
Merge remote-tracking branch 'origin/master'