Added changes for Option[String]
Merge branch 'master' of https://github.com/joelrobotham/informinator

Conflicts:
	app/model/Notification.scala