Merge branch 'set_log'
Merge branch 'master' of https://github.com/limratana/superset

Conflicts:
	client/main.html