version web
Merge branch 'master' of https://github.com/dbalseiro/MembershipProject

Conflicts:
	MembershipProject.suo