added a try and catch block in the parser
Merge branch 'master' into jake
First implementation of notificationview
temporary commit. but started on the requestcommit for the short version