Remove deprecated assembly - Update SCM info
[maven-release-plugin] prepare release v1.7
[maven-release-plugin] prepare for next development iteration
Merge branch 'release/1.7'
Check if the option metadata exists before processing it
Merge pull request #40 from daisy-consortium/issue_378
Update versions for the 1.7.1 release
[maven-release-plugin] prepare release v1.7.1
[maven-release-plugin] prepare for next development iteration
Reset SNAPSHOT versions
Merge pull request #43 from daisy-consortium/release/1.7.1

Release v1.7.1
Add nicename to ports and options in the result xml
Update sample xml file
Add nicenames to ports and options in the script xml
Merge pull request #41 from daisy-consortium/result_nicename

Close #41.
Add support to rewriteURI in the catalog parser
Generate components based on the rewriteURI rules
Merge pull request #33 from daisy-consortium/generate_static

Close #33.
Merge branch 'master' into priority

Conflicts:
	framework-core/pom.xml
	framework-persistence/pom.xml
	pom.xml
	webservice/pom.xml