Plugin is commited
Merge branch 'master' of github.com:8manos/labloom

Conflicts:
	wp-content/plugins/mailchimp-for-wp/includes/class-admin.php
	wp-content/plugins/mailchimp-for-wp/includes/class-form-manager.php
	wp-content/plugins/mailchimp-for-wp/includes/functions/general.php
	wp-content/plugins/mailchimp-for-wp/includes/views/checkbox-settings.php
	wp-content/plugins/mailchimp-for-wp/includes/views/form-settings.php
	wp-content/plugins/mailchimp-for-wp/includes/views/parts/admin-field-wizard.php
	wp-content/plugins/mailchimp-for-wp/includes/views/parts/admin-footer.php
	wp-content/plugins/mailchimp-for-wp/languages/mailchimp-for-wp-es_ES.mo
	wp-content/plugins/mailchimp-for-wp/languages/mailchimp-for-wp-es_ES.po
	wp-content/plugins/mailchimp-for-wp/languages/mailchimp-for-wp-nl_NL.mo
	wp-content/plugins/mailchimp-for-wp/languages/mailchimp-for-wp-nl_NL.po
	wp-content/plugins/mailchimp-for-wp/mailchimp-for-wp.php
	wp-content/plugins/mailchimp-for-wp/readme.txt
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom
Merge branch 'master' of github.com:8manos/labloom