Merge branch 'master' into fileManager
Merge branch 'buttons' into fileManager
Merge branch 'fileManager' into ipAddress