Merge remote-tracking branch 'remotes/hamann/f787b58a237cdfd3b43891dac724e119ef5f6e01' into datepicker_hamann

Conflicts:
	lib/gdash/sinatra_app.rb
Refactor the link to interval to extract the generation of the uri and use URI to generate the urls and keep the parameters
Added a redirect to the /category/dashboard/time/from/to url if the cookie is set and no time is selected
Merge branch 'datepicker_hamann' of https://github.com/keymon/gdash into timepicker

Conflicts:
	lib/gdash/sinatra_app.rb
Merge branch 'refs/heads/timepicker'

Conflicts:
	lib/gdash/sinatra_app.rb
Merge branch 'refs/heads/master' into unicorn