Smartfit App

Committed changes from Smartfit