Changes to new style of directives

<div data-directive="DirectiveName1, DirectiveName2"></div>
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	spec/ObliqueSpec.coffee
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	spec/ListParamsSpec.coffee