adding options for barcharts and half fix for editing after preload
Merge branch 'option_templates'
Merge branch 'master' into wp-chartbuilder-plugin

Conflicts:
	app/partials/data-forms/template-options-service.html
	app/scripts/directives/template-loader.js
ignore them DS_Stores
Merge branch 'wp-chartbuilder-plugin' of github.com:dmachat/angularjs-d3-chartbuilder into wp-chartbuilder-plugin

Conflicts:
	app/scripts/directives/template-loader.js