changed actions to dropdown
Merge branch 'master' into my_reservations

Conflicts:
	app/views/reservations/_actions.html.haml
Merge pull request #146 from joh641/my_reservations

My reservations