Updates to server.
Merge branch 'master' of https://github.com/trylon/UBR-1-App.git

Conflicts:
	UBRApp/gen/edu/hartford/ubr1app/R.java