stories
Merge branch 'develop' into feature/LABB-51
stories with id's
Merge branch 'develop' into feature/LABB-51

Conflicts:
	browser-component/src/main/resources/META-INF/resources/ep2013b/custom/browserComponentTable.xhtml
stories with id's
stories, steps
Merge branch 'feature/LABB-51' into develop