CRM-11682 - Display two different profile-selectors
CRM-11483 - Implement preview pane
CRM-11483 - Don't show extraneous "Done with Preview" button; use custom subclass of AbstractPreview.
Merge branch 'master' of github.com:totten/org.civicrm.profilemockup

Conflicts:
	css/profilemockup.css
	js/view/crm.profile-selector.js
	templates/CRM/Profilemockup/Page/ProfileEditor.tpl