core-4736 refactor code. fix error dialog
core-4774 add announcement when an app is added to workflow
core-4736 made the error dialog modal.
Merge branch 'master' into STABLE