form's template
Merge branch 'master' of http://github.com/ezpaarse-project/ezpaarse

Conflicts:
	public/stylesheets/style.less