Merge branch 'dev'
changed capfile to production
removed old code