fix
Merge branch 'haosun' into rerun
Merge branch 'master' into rerun
test
Merge branch 'master' of github.com:ludwiksh/Marksimos into rerun
update run function for new parameters
Merge branch 'master' into rerun

Conflicts:
	api/controllers/init.js
Merge branch 'rerun'

Conflicts:
	api/controllers/init.js