temp tesing_3png
tmp. most is ok, float ok
3png done
Merge branch 'testing_3png' into testing

Conflicts:
	app/config/config.yml
	web/css/style.min.css
	web/js/script.min.js