trying to deploy
Yajws as service manager
Merge branch 'master' of https://github.com/jagedn/jTwittArd.git
Merge branch 'master' of https://github.com/jagedn/jTwittArd

Conflicts:
	jtwittard/pom.xml