making adapters relation... TDD
users/settings erb -> slim
merge master