fixed style _attribute_ support
vertical-align CSS property support (only lengths, "sub" and "super" values)
verstion => 2.2 beta 1
bookshelp plugin uncommented
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml