tidying up the alert messages
Merge branch 'master' of https://github.com/jcono/timeline
merging
build