Merge origin/master

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

merge from rt