modified preferences handling
modified tests according to bootstrapping
merge
Merge branch 'master' of ssh://git@github.com/tubav/fiteagle.git