commit
Merge branch 'master' into image_upload
updated entries controller and views, capybara for create entry passes
merge