before merge
merged
fixed many to many
test fixed
fixed session usage
db fixed
Fixes login. Renamed User.is_active to User.active