Merge branch 'master' into gallery-plugin

Conflicts:
	plugin-dashboard/src/main/java/org/onehippo/cms7/essentials/rest/config/RestModule.java
	plugin-dashboard/src/main/webapp/js/app.js
Update variant properties, move them from list of properties to their own properties, and update the model and front end accordingly
Add namespace check and update variant properties handling
Add default variant properties for new variant from Angular
Correct check for existing variants, before deleting them, depend on node name, so that name changes will be supported as well
Save image sets to repository on save
ESSENTIALS-109:  Unable to add content block to document type
ESSENTIALS-100:  switching from "Tools" section to "Plugins" section generates "info" messages in log
ESSENTIALS-93:  adjust the final page in the wizard to follow the design
ESSENTIALS-93:  adjust the final page in the wizard to follow the design
ESSENTIALS-88 plugin - content blocks latest merge
Merge branch 'kenan_branch'
- remove error logging
- add drag drop for xinha fields
- keep order of items within payload
- fix xast exception
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/master' into kenan_branch
ESSENTIALS-111 Timeout on gist request
Merge remote-tracking branch 'remotes/origin/kenan_branch'
-use ui routing