creating some cucumber tests
Added user edit feature file
Add instructions to run the cucumber tests
fix paths for cucumber test config files
add installation
Merge branch 'master' into dev
Merge branch 'dev' of https://github.com/elplatt/seltzer into dev
moved billing from plans to payments, fixed perms
Changes amazon payment import to check for existing contact mapping.
Merge pull request #68 from chris18890/billing

moved billing from plans to payments, fixed perms
Merge branch 'dev' of github.com:elplatt/seltzer into dev
Added ability to user email as user authentication; closes #16
Merge branch 'dev' of github.com:elplatt/seltzer into dev
Merge branch 'dev' of github.com:elplatt/seltzer into dev
Updates copyright date and email.
Fixes sort order on payment list.
Merge remote-tracking branch 'upstream/dev' into door

Conflicts:
	crm/include/member/data.inc.php

tidying up