Remove nbsp; again

Spaces in html... now that I added this, it shows two spaces and when I remove it again, to what I think it was before it has one space again. Hmmm, why did it even show no space in the first place...
Anyway, hope this ridiculous bug is fixed now. Maybe double check my work.
Changed Today button to Now button for datetime fields.
Merge pull request #540 from Globegitter/patch-3

Remove nbsp; again
Merge pull request #542 from Globegitter/changed-to-no-button

Changed Today button to Now button for datetime fields.