Merge branch 'hotfix/updatenotice'
fixed update notice. doh
Merge branch 'hotfix/updatenotice2' into develop