Fiksa slik at begge innlogginger havner på samme side
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting.git

Conflicts:
	HIOFCommuting/bin/HIOFCommuting.apk
	HIOFCommuting/bin/classes.dex
	HIOFCommuting/bin/classes/bachelor/register/EmailLoginActivity$PlaceholderFragment.class
	HIOFCommuting/bin/classes/bachelor/register/EmailLoginActivity$ValiderBruker.class
	HIOFCommuting/bin/classes/bachelor/register/EmailLoginActivity.class
	HIOFCommuting/bin/classes/bachelor/tab/TabListener$PlaceholderFragment.class
	HIOFCommuting/bin/classes/bachelor/tab/TabListener.class
	HIOFCommuting/bin/classes/bachelor/tab/TabMap.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/MainActivity$1.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/MainActivity.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$id.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$integer.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$layout.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$menu.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$string.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$style.class
	HIOFCommuting/bin/classes/com/bachelor/hiofcommuting/R$styleable.class
	HIOFCommuting/bin/dexedLibs/google-play-services-ad2ce2ba8301796e576fde6f84b6336f.jar
	HIOFCommuting/bin/dexedLibs/google-play-services-b89a60dd51dfeb2f00e19277deaefa6b.jar
	HIOFCommuting/bin/dexedLibs/google-play-services_lib-bc026cbabc60b21702cf2bb532c7a84c.jar
	HIOFCommuting/bin/dexedLibs/google-play-services_lib-d239f822b54d3573e503a47fab3374f6.jar
	HIOFCommuting/bin/resources.ap_
	HIOFCommuting/gen/com/bachelor/hiofcommuting/R.java