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

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/Benchmark.java
Brent's suggestions for model and dao framework
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
End of Friday Commit!
Merge branch 'master' of http://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/LocalPageDao.java
Merge branch 'master' of http://github.com/shilad/wikapidia
Merge branch 'master' of https://github.com/mlesicko/wikapidia

Conflicts:
	wikapidia-core/src/test/java/org/wikapidia/core/dao/Benchmark.java
Push to pull
Merge branch 'master' of http://github.com/shilad/wikapidia
Updates to LocalPageDao (possibly debunked by Matt)

JavaDocs for PageType
Merge pull request #26 from yli2/master

LocalLink
Merge pull request #27 from rgold1/master

PageType