Update Activator.java
Merge branch 'master' into RCP_Branding
Update Activator.java
Merge branch 'master' into RCP_Branding