nyr stundatoflu skjar
Merge branch 'master' of
https://github.com/hangikjet/World-Class-Iceland.git

Conflicts:
	src/hbv/wci/world_class_iceland/TestDatabaseActivity.java