Made membership accept account email through the api

Conflicts:

	Gemfile.lock
Merge pull request #793 from colibri-software/fix_membership_api

Made membership accept account email through the api