Updated ODF library with new template.
Merge branch '7.x-2.x' of git.drupal.org:project/erpal into 7.x-2.x

Conflicts:
	libraries/odf_api/template/default.odt