log
Merge branch 'nata' of https://github.com/Nataly/siam into nata

Conflicts:
	protected/runtime/application.log