Collection Attributes and Collections inside formdesigner, without layout
Collection Attributes and Collections inside formdesigner, without layout

Merge branch 'topic/collection_2' into releases/demoAug2015

Conflicts:
	Web/resources/shared/dev.css

Ksennija/core-ui,overevkin/core-ui,comindware/core-ui,xSkara/core-ui,comindware/core-ui,comindware/core-ui,xsburg/core-ui,xsburg/core-ui,wilerus/core-ui,wilerus/core-ui,overevkin/core-ui,comindware/core-ui,xsburg/core-ui,xSkara/core-ui,Ksennija/core-ui,wilerus/core-ui,Ksennija/core-ui