Merge pull request #71 from jateeter/master

modified controllers and header.jsp(s) to accomodate firstName/LastName
Merge remote-tracking branch 'upstream/master'
corrected test @Autowire problem and masked failing tests