tidy up of carrierwave code for file types
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
mother fing thumkbnails now created for video uploads winning
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
Merge branch 'development' into video