комит
Merge branch 'dev' of https://github.com/TeoTeak/fplace-site into dev

Conflicts:
	assets/static/css/common.css