Update wireframe for 3.x
Merge branch '3.x'

Conflicts:
	README.md