Move spec/acceptance files to spec/requests
Merge commit '9a11f4b256b0576c298bdc87e92505c0defb4e2a' into HEAD
Merge branch 'develop' into HEAD