Merge pull request #20 from math1man/master

Testing is functional
Throwing ALL the exceptions
Fixed exceptions
Merge pull request #21 from math1man/master

Exceptions
Merge branch 'master' of https://github.com/shilad/wikapidia

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