Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
5.3
Signup page 5.5