Added formatting check for makefiles to not expand tabs
Merge branch 'UI'