Cleaned code
Merge branch 'dev' into feature-uibuilder