changes
Merge branch 'master' of https://github.com/rgold1/wikapidia

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

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

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

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

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

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

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

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

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

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/DaoTransformer.java
	wikapidia-core/src/main/java/org/wikapidia/core/dao/WikapidiaIterable.java
Added Iterator to LinkDao and made a few insignificant changes to other files
Merge branch 'master' of https://github.com/rgold1/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/ArticleDao.java
fixing things
fixing things
fixing things
Merge branch 'master' of https://github.com/mlesicko/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/Benchmark.java
Benchmark
fixing things
fixing things