MB2
Merge branch 'master' into mybranch2

Conflicts:
	index.html
Branch2
Merge branch 'mybranch2'