mainjava
Merge branch 'master' of https://github.com/AhsanLatif/facebook into Sprint4

Conflicts:
	application/controllers/newsfeed.php
	media/js/mainJava.js