add credits to model
message update
added redirect server
added basic shop api
added user service
renamed locations.js
news page
updated weather
fixed token bug
Merge branch 'master' of https://github.com/gould/marmoset