changes to the user account
changed conditional in the view
added date helper method
cleanup
Merge pull request #24 from gyermich/galina

changes to the user account
merge conflict
fixed find_notifications method query