Merge pull request #24 from chunfantasy/NotificationModel

NotificationModel
Merge pull request #25 from chunfantasy/NotificationModel

Removed testfolder, .classpath, .project and calender.iml
Merge remote-tracking branch 'origin/master' into NotificationModel
--