added in third-party provider auth groundwork
Merge branch 'users'
user and role merge fix
Merge branch 'ferristseng-master'
organization and cleaning up. work on web and database packages