Merge pull request #118 from thecookiefactory/hotfix-v1.1.3

Fix some bugs in the login system caused by SEO
Attempt to fix a bug with cookies

Conflicts:
	inc/functions.php
Attempt 2
Merge branch 'hotfix-v1.1.4' into dev

Conflicts:
	inc/functions.php