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 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
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 'master' into beta
Merge branch 'beta' into beta-ics

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

Conflicts:
	assets/default/styles.css
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
synchronization with yota2 branch