Beta 0.11
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo/css/layout.css