added parse xml
Merge branch 'master' of https://github.com/jjcorrea/functional-group

Conflicts:
	hello-play-scala/app/controllers/Application.scala