Use Bootswatch with Cyborg theme
Merge branch 'master' into cyborg

Conflicts:
	Gemfile.lock
gems update
removed unused stylesheet file
Roboto font
less padding for body
Fixed hover issue on drink and payment buttons