Added support for custom ssl port
Fixed typo
Merge branch 'dev' into custom_port
Added support for custom SSL port
Merge remote branch 'upstream/dev' into dev

Conflicts:
	themes/default/_head.twig
Merge pull request #272 from jcsaaddupuy/custom_ssl_port

Custom ssl port