Merge branch 'ice-cream-sandwich' into yota2
XHTML_TAG_P in preferences
new properties in default styles css: margin-left, margin-right & text-indent
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'ice-cream-sandwich' into microtypography
Regular text definition moved to styles.css
Regular text definition moved to styles.css

Conflicts:
	assets/default/styles.xml
formatting
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	assets/default/styles.xml
Merge branch 'ice-cream-sandwich' into yota2

Conflicts:
	assets/default/styles.css
Merge branch 'ice-cream-sandwich' into microtypography
synchronization with yota2 branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'ice-cream-sandwich' into microtypography
no more styles in styles.xml
removed obsolete code
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2