specs for Calendar
extract code from controller
temporary commit for move to github
Merge branch 'dev' into feature/estimations-rectangle
remove default README
estimations#index_for_short_name_within_area
Clean up metro transit settings
Merge branch 'dev' into feature/estimations-rectangle

Conflicts:
	Gemfile.lock
Merge branch 'release/0.3.0' into dev
cache stops
Merge branch 'hotfix/0.3.1'
Merge branch 'hotfix/0.3.1' into dev
Merge branch 'feature/estimations-rectangle' into dev

Conflicts:
	Gemfile.lock
bump version
Merge branch 'release/0.4.0'