fix #3 - Merge remote-tracking branch 'upstream/master'

Conflicts:
	trunk/JGitMinerWeb/nbproject/build-impl.xml
	trunk/JGitMinerWeb/nbproject/genfiles.properties
	trunk/JGitMinerWeb/nbproject/project.properties
	trunk/JGitMinerWeb/nbproject/project.xml
	trunk/JGitMinerWeb/src/conf/persistence.xml
	trunk/JGitMinerWeb/src/java/br/edu/utfpr/cm/JGitMinerWeb/model/miner/EntityRepository.java
	trunk/JGitMinerWeb/src/java/br/edu/utfpr/cm/JGitMinerWeb/services/AbstractServices.java
	trunk/JGitMinerWeb/src/java/br/edu/utfpr/cm/JGitMinerWeb/services/matriz/FileModifiedTogetherOnIssueInMilestoneServices.java