updated mappers and loaders
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	semtag-core/src/main/java/org/semtag/mapper/WikapidiaMapper.java
updated mappers and loaders
Merge remote-tracking branch 'origin/dev' into dev