add ability to auto-add users to group, add events for membership request approved, invitation added and user added to group

commit 81fa7027845aaf3dfa6719972dd16084a7d29859
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Mon Aug 12 11:26:49 2013 +1200

    wip

commit 17a56a840ca475ae82253bd39d9f339df35e6f11
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Fri Aug 9 15:56:07 2013 +1200

    add events

commit d2771ca34be77091858c634373c1e7680c0030a3
Merge: b4b4cb3 13e5e75
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Fri Aug 9 12:16:18 2013 +1200

    Merge branch 'feature/email-requester-when-membership-approved' into feature/email-when-auto-added

commit b4b4cb3cee5ad0f32b8c3d75aad2706b8d29ce3c
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Fri Aug 9 12:12:51 2013 +1200

    wip

commit 13e5e759f0460e29d202565d6ad5c08cb818c0d6
Merge: b506127 6a37d18
Author: Aaron Thornton <aaronthornton00@gmail.com>
Date:   Fri Aug 9 12:11:23 2013 +1200

    Merge branch 'master' of github.com:loomio/loomio into feature/email-requester-when-membership-approved

    * 'master' of github.com:loomio/loomio: (21 commits)
      fixed stupid simpleform locale issue
      Fix schema
      fix footer
      dont look at this commit
      Fix major discussion page perf issue
      Add Vietnamese and French; plus minor changes
      Revert "Update devise"
      Update devise
      convert paying_subscription to payment_plan
      generate welcome to Loomio email on setup completion
      Fix redirect after sign in
      fix font visibility - input fields & font-weight
      change dropdown to dropup
      add blog to footer
      Update admin panel
      Update start group subject
      update invitation to start group email text
      fix create non subgroup ability exception
      update logo
      fix time so paypal works
      ...

    Conflicts:
    	features/step_definitions/request_membership_steps.rb

commit b50612720126f8a8192a2829bed007a837a1e165
Author: Aaron Thornton <aaronthornton00@gmail.com>
Date:   Fri Aug 9 12:07:55 2013 +1200

    robs refactor

commit 6041a1fcfe46b63756468dd0f32fa647c562265f
Author: john irving <whimful@gmail.com>
Date:   Tue Aug 6 17:57:14 2013 +1200

    auto add existing members

commit 17ded69d52cea5a19be8bf131aad668026b4e4fc
Author: Aaron Thornton <aaronthornton00@gmail.com>
Date:   Sun Aug 4 21:12:22 2013 +1200

    add membership_request_approved event and spec

commit 0b2308bf3c79670c1c07ea871daaa9a65d05561e
Author: Aaron Thornton <aaronthornton00@gmail.com>
Date:   Thu Jul 25 12:24:40 2013 +1200

    Email user when their membership request is accepted.