fix layout user edit, remove bootstrap.min1
Merge branch 'master' of https://github.com/minhy/happy-water