cal-heatmap
Merge branch 'master' into feature/graph
Merge branch 'master' into feature/graph
add activity(heatmap)
Merge branch 'master' into feature/graph

Conflicts:
	app/assets/javascripts/better-day/apps/templates/dest/precompile.handlebars.js
	app/assets/javascripts/schedule.js.coffee
	app/assets/stylesheets/application.css.scss
heatmap design config
Merge branch 'master' into feature/graph

Conflicts:
	app/assets/javascripts/better-day/apps/templates/dest/precompile.handlebars.js
	config/routes.rb
Merge pull request #53 from igrs/feature/graph

Feature/graph