Last commit
Merge branch 'master' of https://github.com/Stelss0007/girl
Last
Merge branch 'master' of https://github.com/Stelss0007/girl

Conflicts:
	protected/runtime/application.log
Comments ready