varie
wip galleria.asp
Merge remote-tracking branch 'origin/dev_gimoz71' into dev_iury

Conflicts:
	compass_app_log.txt
	css/css.css
Merge remote-tracking branch 'origin/dev_gimoz71' into dev_iury