Merge pull request #52 from linjiming/new_plan_page

uncouple capability and configuration pages
add parameter --rerun