Lots of stuff
Merge branch 'master' of github.com:sorenu/ShapeCockpit

Conflicts:
	ShapeCockpit/ShapeCockpit.xcodeproj/project.pbxproj
	ShapeCockpit/ShapeCockpit/Adapters/SCFlurryToPieChartAdapter.m
	ShapeCockpit/ShapeCockpit/SCAppDelegate.m
All the good stuff!
Merge branch 'master' of github.com:sorenu/ShapeCockpit

# By Jonas Lysgaard-Hansen (2) and Soren Ulrikkeholm (2)
# Via Jonas Lysgaard-Hansen
* 'master' of github.com:sorenu/ShapeCockpit:
  Cleaned up
  Combining and sorting daily active users.
  Formatting
  Started implementing flurry integration

Conflicts:
	ShapeCockpit/Podfile
	ShapeCockpit/Podfile.lock
	ShapeCockpit/ShapeCockpit/Controllers/SCDashboardViewController.m
	ShapeCockpit/ShapeCockpit/DataProviders/SCFlurryDataProvider.m
Merge problem
Fixed problem