enabled Entry for tps (only numbers, approximation for twisted numbers and adaption for buttons)
Merge branch 'master' of github.com:brainpower/Maximum-Fish
Merge branch 'master' of github.com:brainpower/Maximum-Fish
Merge branch 'master' of github.com:brainpower/Maximum-Fish

Conflicts:
	src/renderer/ui/windows/Control.cpp
	src/renderer/ui/windows/Control.hpp