changes on public pages
Merge remote-tracking branch 'origin/miroslav' into dev