reviewers update
Merge branch 'master' of https://github.com/drag0nius/pwpz13_conferences

Conflicts:
	conferences/templates/conferences/base.html