Servlet: create an abstract class for metadata parsing
Merge remote-tracking branch 'origin/master'