Pull updated Develop branch
?
?
?
?
Added fonts and started Time Control Fragment
Merge branch 'UI-upgrade' into Develop