Prevent form submit on enter keypress
Resolved conflicts
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
Separated words and media file
resolved conflicts
updated search checkins form
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
Merge branch 'ransack' into development
working on people search
 Merge branch 'ransack' into development
resolved conflicts