deleted a file
Revert "deleted a file"

This reverts commit 7e58ecc2fe1dbf4990274ab65b474c58845826bb.
Merge branch 'master' into faandg_branch
Implementing JPA part 1
Datanucleus dependencies + DAO + DTO + persistence adjustments to add user to datastore
Fixed callback error, add/del dependencies, adjusted versions
Removed/replaced all GAE ties