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
Merge commit 'df5a13fe17341a0edab690f83afc922b5b09a9de' into 7.x-stable