Merge branch 'happytodesign-favicon_notifications' into development
authorDarren <darren@darrenwhitlen.com>
Fri, 28 Jun 2013 18:57:55 +0000 (19:57 +0100)
committerDarren <darren@darrenwhitlen.com>
Fri, 28 Jun 2013 18:57:55 +0000 (19:57 +0100)

Trivial merge