Fixed regression where app would display numeral when a float is entered
Merge branch 'master' into develop
Merge branch 'develop'