Rydding
Endret menynavn/label
Endret menynavn/label+++
Rydding
Merge pull request #3 from ovestoerholt/DevOST

Dev ost
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	HovedMeny/src/main/java/no/inforte/android/hovedmeny/MainActivity.java
	HovedMeny/src/main/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
Endret menynavn/label+++