Issues fixed and internationalisation added
Merge branch 'beta_wb_testing' of github.com:pkwiecien/tumitfahrer into beta_wb_testing

Conflicts:
	app/controllers/rides_controller.rb