Diamonds are forever
Merge branch 'master' of github.com:caelum/vraptor4