Cosmetics: Auto-indent all the source files preparing to merge
Cosmetics: Auto-indent all the layout files preparing to merge