addFieldMerge modal
Merge branch 'master' of github.com:Exartu/Exartu-DocCenter

Conflicts:
	lib/designer/designer.js
DocCenter - Second iteration
Merge branch 'master' of github.com:Exartu/Exartu-DocCenter