Merge branch 'master' of https://github.com/jagedn/jTwittArd

Conflicts:
	jtwittard/pom.xml