Merge upstream/master

Conflicts:
	README.md
Merge upstream/master

Conflicts:
	README.md
Merge upstream/master

Conflicts:
	README.md
Merge upstream/master
Merge upstream/master

Conflicts:
	README.md
Merge upstream/master
Admin title bar redone