Add d3.js and Cal-HeatMap gems
Add sample activity calendar
Add moment.js and update gems
Some tweaks to activities map
Merge branch 'beta' into activity-heat-map-feature
Add simple finder scope to user model
Refactor UserController, add route to activities JSON
Refactor activity and notifications scopes
Update activities calendar view
Merge branch 'beta' into activity-heat-map-feature

Conflicts:
	app/models/notification.rb
Update some gems
Fix URL to user activities
Move user activity calendar data accessor into model
Add time period parameters to Activity data
Consider date period in user activity control
Use our own Cal-HeatMap Rails engine
Update locales
Update user activity calendar views
Update user activity calendar styles
Rename user activity calendar partial view