Merge branch 'master' of https://github.com/IVplay/conference_site

Conflicts:
	.idea/workspace.xml