packrat resolve conflict dialog
detect changes to the repos option
Merge remote-tracking branch 'origin/master' into feature/pending-actions

Conflicts:
	src/gwt/src/org/rstudio/studio/client/workbench/views/packages/Packages.java