CRM-13390
Merge pull request #59 from yashodha/views-fixes

CRM-13390