Test app branch merge

merging install-devise-in-test-app with extract-functionality-from-test-app. There were several merge conflicts I had to resolve so creating a pull request for you to review them