test commit
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/ConceptDao.java