First Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	portal/dataProvider/Authorization.php
	portal/direct/poll.php
First Commit