added shorturl to mail templates and viewcache template
renamed 'shorturl' field in viewcache template
Merge remote-tracking branch 'flopp/shorturl' into next