edit layout
precompile
New Welcome Page, Adding About, Editing Layout
merge + fix merge conflicts (tegel)
fix merge conflict + precompile
merge + fix merge conflicts (muntel) + precompile
merge + fix merge conflicts (timo) + precompile
changed fixes