user edit page merge fix
Merge branch 'master' of github.com:alexstoddard/reBook