Merge pull request #1 from xpansa/master

Merge from xpansa
[RM] Remove emergency and website in announcement fix #8
Merge pull request #2 from xpansa/master

[MERGE]
Merge pull request #20 from YannickB/master

[RM] Remove emergency and website in announcement fix #8