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

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/IVplay/conference_site

Conflicts:
	.idea/workspace.xml