Ryddet i gradle settings for master branch
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	gradle/wrapper/gradle-wrapper.properties
La til manglende icon (action new)