Merged in tjblonsk/steelos-rails (pull request #184)

Changed T and F icons on article detail page.
Merged in tjblonsk/steelos-rails (pull request #185)

Homepage active and image upload
Added bare files for discounts calculator
Move subtotal calculation to order model.
Added blank discount factory class. Move discount amount tests from order calculator to discount calculator.
Split discount calculation into limiters and discount types.
Added discount factory implementation.
Merged in rquantz/steelos-rails (pull request #186)

Discounts