Added default lang 

Issue : #223
Various code-example tidyups: #222 #223
Last edits to code highlighting: #225 #222
Merge branch 'version-1.04' into version-1.05

Conflicts:
	en/activity-standard/activity-standard-example-annotated-multi.xml
	en/activity-standard/activity-standard-example-annotated.xml