latest changes
Cleanup
Merge branch 'master' of https://github.com/sedan/perfume

Conflicts:

sites/all/themes/blank/templates/views/views-view-fields--pricelists--bl
ock.tpl.php