Merge pull request #6 from isotope11/fix-pluralization-problems

fix pluralization problems with localization pluralization.
Merge pull request #7 from isotope11/attach-posts-to-users

Attach posts to users
Merge branch 'master' of git://github.com/isotope11/forem

* 'master' of git://github.com/isotope11/forem: (25 commits)
  [view] Oops, buggy text describing forums table previously.  Fixed.
  [view] Make forums index page more interesting (table view).  Use same class (subdued) for both tables for common table styling.
  [forum listing] Add more interesting data to forum listing on index page.
  [view] Suppress pagination links if not more than one page.
  [pages] Make pagination more explicit.
  [view] Move user tile to its own partial to make it easier for sites to override this tile.
  [view] link back to forums from a within a given forum.
  [CLEANUP] remove stale TODO - pagination is go
  [controller] On forum show page, order topics by most recently post.
  [markup] Add forum head to new topic page, some logic to hide new topic link if on new topic page.
  [markup] Pretty up post markup a bit more.
  [markup] Add better markup for posts.
  [text, markup] More tweaks to text and markup for the forums.
  [i18n] Switch to translation for some static text.
  fix pluralization problems with localization pluralization.
  [view] More work on the views to make them more easily styled.
  [view] Make forum show's topic listing list topics in a table; add some more data to the listing.
  [pagination] Add pagination for topics, posts.
  [html] Just making the layout be more consistent with a typical forum layout w/r/t showing forum heading up top, allow new topics from any subtopic, etc.
  [view] Add 'back to topics' link on a given topic show for a forum.
  ...
Merge branch 'master' of git://github.com/isotope11/forem

* 'master' of git://github.com/isotope11/forem:
  Some commits to make tests pass, because I broke them horribly.  Sorry.
[locked topics] Add spec to make sure that posts cannot be created on locked topics.
[add locked topics] Remove reply links unless topic can be replied to.
[locked topics] Add css classes to locked topics in index, show views.
[add markdown] Add markdown helper, rdiscount gem.  Use markdown for post text.
[add pinned topics] Added the ability to pin topics, named scope to order them first, then by recent posts.
Update Gemfile.lock dependencies
Merge branch 'master' of git://github.com/isotope11/forem

* 'master' of git://github.com/isotope11/forem:
  [add pinned topics] Added the ability to pin topics, named scope to order them first, then by recent posts.
  [add markdown] Add markdown helper, rdiscount gem.  Use markdown for post text.
  [locked topics] Add css classes to locked topics in index, show views.
  [add locked topics] Remove reply links unless topic can be replied to.
  [locked topics] Add spec to make sure that posts cannot be created on locked topics.

Conflicts:
	Gemfile.lock
Update dependencies
[add views] Add view model, register a view each topic show, and show view count on topics listing.
[add views] Don't require a user to add a new view to the database.
[add view] Add created_at to views table.
[add views] Refactor view implementation so that it doesn't try to save the user if it's new.  This is a change made solely to support the sign_in! method in the spec dummy_login support file.  Doesn't make the code worse really, so it should be fine.  More importantly, the tests pass again.
[add view] Add integration test to verify View record is created on view.
[icons] Add markup for icons for pinned, locked topics.
updated to Rails release candidate.
Probably best to use rails-3-1 branch of RefineryCMS