Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge branch 'master' of github.com:ecabrerar/BarCampSTI2013-Maven

Conflicts:
	README.md