edits
Merge branch 'master' of https://github.com/srophe/manuscripts

Conflicts:
	Blank template file.xml
edits