Rearranges routes to allow for user creation from app
Repairs merge conflict in users controller