Uppdaterad Om-oss sida.
Merge branch 'omOss' - No strings.xml because of misstakenly removed
information in conflictng file

Conflicts:
	AndroidApp/res/layout/omss.xml
	AndroidApp/res/values/strings.xml