Merge remote-tracking branch 'origin/master' into media-rss-1.5.1

Conflicts:
	src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java
	src/main/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java
	src/main/java/org/rometools/feed/module/mediarss/types/Metadata.java
	src/main/java/org/rometools/feed/module/mediarss/types/Restriction.java
	src/test/java/org/rometools/feed/module/mediarss/MediaModuleTest.java