ticket:1 tests fix
ticket:1 makefile fix
ticket:1 dummy commit to master
Merge branch 't15_cleanup'
Merge branch 't15_cleanup'
Merge branch 't15_cleanup'

Conflicts:
	Makefile
ticket:15 html fix
ticket:15 html fix of fix
ticket:1 cleanup settings