update branch
Merge branch 'master' into Pettan_devBranch
Cleaned up responsive template and mobile!
merge fix