fixing version issues.  Also, splitting aplicationContext.xml into 2 files for easier determination of yoga vs. dao
Merge remote-tracking branch 'upstream/master'
Merge pull request #223 from sduskis/master

fixing version issues because the build is broken