Merge branch 'master' of https://github.com/SvenssonWeb/PizzUpProject

Conflicts:
	PizzUp/src/main/res/layout/activity_res.xml
asdf