Fixing the template property access
Merge branch 'application_prefix' into zahpee