Added merit and reimplementing leveling

Use user.add_exp(integer) to add points
levelling milestones are in models/merit/rank_rules.rb
added feature test for awarding a badge when user creates the first question
migrated database
solve conflicts with merge