dfsdfs
Merge branch 'master' of https://github.com/satnambajwa85/testing

Conflicts:
	protected/runtime/application.log
changes