Updated generator routes to use get instead of match to work with rails 4
Merge branch 'feature/development' into prototype