First commit with tabs template
Merge branch 'jerre' of https://github.com/ProgressBox/ProgressBoxApp into jerre