bugfix
merge
merge
Merge branch 'infinity' of ssh://github.com/tubav/fiteagle into infinity