updated item views
fix merge issue in item model
encrypted email. reset dev db