Merge branch 'master' of github.com:stabenfeldt/Venues2Json
assets has to be in vendor/assets
add bootstrap.js.min to application.js
not need to include bootstrap here, it´s packaged by the asset pipeline
serve static content
Fixed bug in redirect. Typo.
upgraded rails
added validate_presence_of
no need to display sun hours yet.
Merge branch 'master' of github.com:stabenfeldt/Venues2Json

Conflicts:
	app/assets/javascripts/bootstrap.min.js
	lib/assets/javascripts/bootstrap.min.js
	vendor/assets/javascripts/bootstrap.min.js