added locations to merchants, enabled basic devise user functionality
added locations to merchants, enabled basic devise user functionality