Edited History
change in admin
Merge remote-tracking branch 'origin/master'

Conflicts:
	server_workspace/ChatServer/templates/Admin_history.html
Merge branch 'master' of https://github.com/RajatBhageria/CodeForGood2014