resolve code conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Export/css/tp_accordion.css
	Export/css/tp_pg1.css
	Export/muse_manifest.xml
	Export/tp_accordion.html
	Export/tp_pg1.html
	ModXTemplate_draft5.muse