session beta
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/index.php
session beta