User(manager)-user(seller) connection
User(manager)-user(seller) connection fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/conf/BootStrap.groovy