Update
Merge branch 'master' of github.com:kasparsd/viaorbiter.com
Update template variables