updated to include new compilation routes
added routes for assets
Merge remote-tracking branch 'upstream/master'