saving changes to posts for merge
updated conflicts
refactored rewards and added top posts reward
updated reward model
tweaked front end
view manager and close events
removed stray comment
FAQ update
added load true
Merge pull request #364 from elihart/faq

FAQ update
Merge pull request #365 from maplesyrup/move-password

Hide password from database.yml
fixed conflicts
Merge pull request #357 from CalvinFernandez/view-manager

view manager and close events
fixed merge conflicts
Merge pull request #353 from CalvinFernandez/campaigntopposts

Top post feature MVP
Merge remote-tracking branch 'upstream/master' into move-password
Minor change from production to test