Form directive initial
Merge branch 'candidate-management' into gh-pages

Conflicts:
	js/fidirectives.js