Firsty
Initial commit
Merge branch 'master' of https://github.com/pensivearchitect/forum
Merge branch 'master' of https://github.com/discourse/discourse
Working production version Apologies for style
Updated assets
Updated env and packages
Merge branch 'master' of https://github.com/discourse/discourse
Updated stuff, apologies for bad form
Updated gitignore to preserve database
Removed .gitignore
Updated NO translation - Some questions in dscr.

Did X more lines.

I'm afraid to change stuff that's not in quotes, so I'm unsure whether or not I should be changing line like these:

      browse_all_categories: Browse all categories

      view_latest_topics: view latest topics
      suggest_create_topic: Why not create a topic?
      jump_reply_up: jump to earlier reply
      jump_reply_down: jump to later reply

or these:

      progress:
        title: topic progress
        jump_top: jump to first post
        jump_bottom: jump to last post
        total: total posts
        current: current post
Correctly resize big images in preview
http://meta.discourse.org/t/correctly-resize-big-images-in-preview/4426/4
FIX: lightbox wasn't working when using s3 upload
basic requires that 20 topics are entered thanks @novemberkilo
missing dependency
bad locale files could lead to broken automatic groups
do not lightbox oneboxed images
Merge pull request #1079 from ZogStriP/do-not-lightbox-oneboxed-images

do not lightbox oneboxed images
Merge pull request #1075 from ZogStriP/fix-lightboxing-when-using-s3

FIX: lightbox wasn't working when using s3 upload