updated to panopoly 1.5
Merge branch 'master' of github.com:miromarchi/rbv_org