Småfiks i emailloginactivity
får ikke pushaaa
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/dexedLibs/facebooksdk-ab4e8f089805244e0279be7acc3f790b.jar
	HIOFCommuting/bin/dexedLibs/google-play-services_lib-d239f822b54d3573e503a47fab3374f6.jar
	HIOFCommuting/bin/resources.ap_