Updates
Updates
Updates
Updates
Updates
Updates
Updates
Updates
Trying to update
Updates
Catch up
Merge origin/master

Conflicts:
	Controllers/GuestController.php
Merge origin/master

Conflicts:
	Controllers/GuestController.php
Updates
Updates
Merge origin/master

Conflicts:
	Controllers/GuestController.php
	Stdlib/Page.php
Merge origin/master

Conflicts:
	Controllers/GuestController.php
	Stdlib/Page.php
Updates from E-Learner
Updates
Updates