merged server
route changes
merged with master
Merge branch 'master' into fix_routes
Merge branch 'master' into fix_routes
Updated extra routes to be similar to FRED api, added 3 additional tests and updated old ones