Merge with master branch 9/9/14#250

aguibert wants to merge 1 commit into

javaee-samples:masterjavaee-samples/javaee7-samples:masterfrom

aguibert:masteraguibert/javaee7-samples:masterCopy head branch name to clipboard