bug fix

Conflicts:
	js/directives.js