Merge pull request #6 from lighthouse-labs/feature/14-factory-girl

Feature/14 factory girl
Merge branch 'master' of https://github.com/lighthouse-labs/selfstarter into feature/19-timeline-graph
Moved json page to admin/orders controller