Fix
Merge branch 'master' of https://github.com/OtiAnn/Wabicon

Conflicts:
	app/controllers/members_controller.rb