Stubbing in reports
Merge branch 'refs/heads/cedar' into reporting
Merge branch 'refs/heads/expansion' into reporting
First pass at reporting
First pass at graphing
Merge branch 'refs/heads/expansion' into reporting
Merge branch 'refs/heads/expansion' into reporting

Conflicts:
	db/schema.rb
Merge branch 'refs/heads/expansion' into reporting
Merge branch 'refs/heads/expansion' into reporting
More explicit types for content items
IP tables views for users, supporting of 'content items' report type
Merge branch 'refs/heads/expansion' into reporting
Merge branch 'refs/heads/expansion' into reporting
Merge branch 'refs/heads/expansion' into reporting
Fixing conflict with "content" div
Merge branch 'refs/heads/expansion' into reporting

Conflicts:
	Gemfile.lock
concept if inline for content_items based of their category
Properly grab event tags for content items!
Merge branch 'refs/heads/expansion' into reporting
Merge branch 'refs/heads/optimizations' into reporting