all ajaxes
my commit prateek

Conflicts:
	app/controllers/ChatController.php
	js/search.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/controllers/AjaxController.php
	app/controllers/ChatController.php
	app/controllers/EventsController.php
	app/controllers/FriendsController.php
	js/pages/editArticle.js
	js/pages/quiz.js
	js/pages/readBlogBook.js
	js/pages/readCollaboration.js