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

Conflicts:
	media/js/mainJava.js
some files
some more files
some more previously left files
config
some db files
Merge branch 'master' of https://github.com/AhsanLatif/facebook into Sprint4

Conflicts:
	media/js/mainJava.js