Some Corrections
Merge branch 'master' of https://github.com/harshitism/social_calender

Conflicts:
	application/controllers/Login.php