Merge origin/master

Conflicts:
	nbproject/project.properties
	src/jp/co/wap/exam/PersistentQueue.java
	src/jp/co/wap/exam/Problem1.java
	src/jp/co/wap/exam/Problem2.java
	src/jp/co/wap/exam/lib/Interval.java
	src/levens/DistanceTest2.java