devise implemented
changes to controller
updated conflicts; devised related conflicts