asdvasv
Merge branch 'master' of https://github.com/mtjoe/theclubbiz-website

Conflicts:
	theclubbiz-website/app/controllers/societies_controller.rb
Merge branch 'master' of https://github.com/mtjoe/theclubbiz-website