new file:   scripts/simulate.py
	new file:   fw_userstudy/static/css/info_base.css
	modified:   fw_userstudy/templates/fedtask/task_ui2_base.html
Merge branch 'master' of https://github.com/jiyinhe/fedweb_ui