Action bar fix
Added a button in info to join the pool
Merge branch 'master' into registerRide

Conflicts:
	res/layout/ride_info.xml