Merge pull request #30 from gaurav/feature/unwrapped-self-template

Support "unwrapping" templates like {{self}}
Merge pull request #33 from gaurav/feature/galleryextractor

Gallery Extractor: links galleries to the file used
Merge branch 'commons' of github.com:gaurav/extraction-framework into commons
First attempt at an ImageAnnotation mapping.
Added dbo:hasAnnotation and dbo:asWikiText (and updated ontology to include them).
Improved source code comments.
Improved error detection.
Fixed some formatting issues and simplified a piece of code.
Added width and height to thumbnail URL where present; don't generate description and asWikiText except where not blank; don't include nodeStart and nodeEnd in asWikiText.
Added ImageAnnotationExtractor to the default Commons extraction.
Merge branch 'master' into feature/imageannotations

Conflicts:
	core/src/main/scala/org/dbpedia/extraction/destinations/DBpediaDatasets.scala
	dump/extraction.default.properties
Merge pull request #265 from gaurav/feature/imageannotations

Image Annotation Extractor