Fixed small bug in query that I had to fix in my ActionMiner class to
get it to run.
Merge remote-tracking branch 'origin/master'

Conflicts:
	seminer/src/cvsanaly/CvsAnalyReader.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixed cvsanaly hibernate xml files.  Changed a jar file to a version
build on java 6.  Changed ant script to default to java 6
merged
Merge branch 'master' of https://github.com/laa018/cs680_team4.git