Merge origin/master

Conflicts:
	AdminPages/CreateMember.php
	AdminPages/CreateNewEvent.php
	AdminPages/UpdateMemberProfile.php
	AdminPages/ViewCurrentEvents.php
	AdminPages/ViewPastEvents.php
	MemberPages/PastEvents.php
	MemberPages/Success.php
	MemberPages/signup.php
	views/_footer.php
Merge origin/master

Conflicts:
	MemberPages/signup.php