making DatabaseAccess compatible with User, constructors still todo.
added getId to User
Merge branch 'master' of
https://github.com/BrainTrainSite/BrainTrain.git

Conflicts:
	src/braintrain/User.java
making db stuff match some stuff, integrating