Related komið
Merge remote-tracking branch 'origin/master'

Conflicts:
	TiVi-Dagatal-Fragment/res/values/strings.xml

	TiVi-Dagatal-Fragment/src/com/example/tivi_dagatal_fragment/FragmentList.java