all fixes from dev-stable
modifications of activitye
removed diagrams
Merge branch 'feature-20140402-dev-gui' into 20140401-dev-stable