checkin old changes
Merge pull request #10 from DutchApp/dashboard_piechart

checkin old changes
rspec changes
merge from master