gitignore config
Merge branch 'master' into lpt
more compact question display and header
Merge branch 'master' into lpt

Conflicts:
	src/production_base/tpl/default/css/style.css.php
	src/production_base/tpl/default/header.php
merge fail... now it's working