changes to uframedb_lib
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe

Conflicts:
	UFrame/bin/db/uframedb_lib.js