about fixes #416
Merge branch 'master' of github.com:ging/social_stream
Removed typo and made phrasing less awkward and less wordy in english
bring name field inline with asterisk in edit personal information form
Merge pull request #429 from srtech/master

Brought the "name" label in line with the asterisk (*)
Merge pull request #428 from ericrav/localefix

Removed typo and made phrasing less awkward and less wordy in english
include applications toolbar. fixes #430
Eager load Relation::Public
Support cancelling attachments in wall input

Fixes #420
Fix typo in fonts path

Closes #424
Update strong_parameters dependency