add controller, fix editor for brand in admin
Merge branch 'master' of https://github.com/minhy/happy-water