Merge origin/master

Conflicts:
	protected/runtime/application.log
Merge pull request #1 from aarthika-nathan/master

merge from rt
crew edited
shifting
shifting
13
Merge origin/master
home page admin edited
Merge branch 'master' of git://github.com/Prakhash/MoraLit into Prakhash-master

Conflicts:
	protected/runtime/application.log
Merge branch 'Prakhash-master'
Merge pull request #6 from bruntha1991/master

I have given youa pull req