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
Merge remote-tracking branch 'rgold1/master'
Merge branch 'master' of https://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/mlesicko/wikapidia
Merge remote-tracking branch 'math1man/master'

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/TestDao.java
Merge branch 'master' of https://github.com/rgold1/wikapidia
Merge branch 'master' of https://github.com/math1man/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/TestDao.java
Merge branch 'master' of https://github.com/rgold1/wikapidia
Merge branch 'master' of https://github.com/math1man/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/TestDao.java
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/TestDao.java
Merge branch 'master' of https://github.com/rgold1/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/TestDao.java