trim whitespace
Remove p and h4, replace with labels, ids and for attar.
style fixes
Merge branch 'refs/heads/master' into labels

Conflicts:
	classes.fields.php
use incorrect property name
trim whitespace
Merge pull request #29 from humanmade/labels

Labels