Remove closing whitespace (activation error msgs)
Merge pull request #1 from clutchwave/master

Rebase with master before doing new dev