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

Conflicts:
	PizzUp/PizzUp.iml
	PizzUp/src/main/res/layout/activity_main.xml
	PizzUpProject.iml
	gradle/gradle/wrapper/gradle-wrapper.properties