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

Conflicts:
	application/views/profile.php