.
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/views/page/register.jade
.