better checking for duplicate keys
Merge branch 'master' of ssh://github.com/tubav/fiteagle into mitja
edited test
small fix
test fix