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
Mysql jdbc driver dependency
Warning fixes
13/04/14
aanpassingen ivm overview.java naar meerdere pagina's
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/com/programmeren4/turnahead/client/ui/FormHome.java
	src/main/java/com/programmeren4/turnahead/client/ui/Home.java
	src/main/java/com/programmeren4/turnahead/server/UserDataserviceImpl.java