Conflict
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting

Conflicts:
	HIOFCommuting/bin/HIOFCommuting.apk
	HIOFCommuting/bin/classes.dex
	HIOFCommuting/bin/classes/bachelor/register/registerFragment.class
	HIOFCommuting/bin/classes/bachelor/tab/TabListener$PlaceholderFragment.class
	HIOFCommuting/bin/classes/bachelor/tab/TabListener.class
	HIOFCommuting/bin/resources.ap_