user updates working
Merge branch 'master' of https://github.com/jasonbrice/wblibrary

Conflicts:
	database/db.sqlite