upadd
Merge branch 'master' of github.com:krongk/tm_admin

Conflicts:
	public/templates/gallery/swiper/assets/style.css