update
Merge branch 'master' of https://github.com/hycis/conditional_computation

Conflicts:
	mlp_model/hps.py
	tools/default_config.py
remove default_config
Merge branch 'master' of https://github.com/hycis/conditional_computation

Conflicts:
	tools/default_config.py
Merge branch 'master' of https://github.com/hycis/conditional_computation
remove conflict
update