bugfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/stylesheets/resource.less
add validator