refactored
resoved bug issue
refactored app
Merge branch 'master' into iman
added gem file
added calendar
modified calander
events added