2.0.2 preview 1

This version improves on the following items:

• Let user resolve conflicts when importing mpsites files (Issue #25, Issue #28)
• various minor issues and improvements.