Begin registration
log

log
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/cache/twig/7c/2e/8cdce896dc236e5ff037b368be8b.php
	application/cache/twig/eb/70/7a4cad621b92cc45abddd27a8007.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/cache/twig/7c/2e/8cdce896dc236e5ff037b368be8b.php
	application/cache/twig/eb/70/7a4cad621b92cc45abddd27a8007.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/cache/twig/7c/2e/8cdce896dc236e5ff037b368be8b.php