Endret menynavn/label
Endret menynavn/label+++
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+++
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)
Merge branch 'DevOST'

Conflicts:
	HovedMeny/src/main/java/no/inforte/android/hovedmeny/FragmentMyStatus.java
	HovedMeny/src/main/java/no/inforte/android/hovedmeny/FragmentMyTriggers.java
	HovedMeny/src/main/java/no/inforte/android/hovedmeny/MainActivity.java
	HovedMeny/src/main/res/layout/fragment_rune.xml
	HovedMeny/src/main/res/values/strings.xml
Redigering av master branch for å rydde etter merge med DevOST.