BookElement rendering (in progress)
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
better intro style
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
synchronisation with intro branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics