Merge pull request #26 from sunnyLA4/fresh

few modification in names
Merge pull request #27 from sunnyLA4/fresh

Fresh
Merge pull request #28 from sunnyLA4/fresh

nfs edited
Merge pull request #250 from sunnyLA4/master

few names modified
Merge remote-tracking branch 'upstream/master' into fresh
one mega event added | need to add database entry code