Синхронизация правок

Signed-off-by: Phys <phys@aic.ru>
Merge branch 'master' of github.com:bestAIC/EPGU

Conflicts:
	css/main.css
	js/main.js

Signed-off-by: Phys <phys@aic.ru>