I18N og adaptere
Merge branch 'master' of https://github.com/tonjeb/Assignment2.git

Conflicts:
	src/no/livedata/funrun/app/funrun/Main.java
	src/no/livedata/funrun/app/funrun/library/ActivityAdapter.java