form validation
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/sv-input-txt.html
	app/views/directives/sv-input-txt.jade
Merge remote-tracking branch 'origin/master'
form validation