a
Merge branch 'master' of https://github.com/behaiha/vatthela

Conflicts:
	protected/runtime/application.log