merge from master
update routes file to new array syntax
add assets, set up primary route
rollback ptovac temp stuff
Merge branch 'develop'