Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
added translation of &#039; to a quote. should probabaly look into
escaping the HTML entities instead.
house keeping
added four new advent links