Added user class to tables
Removed unused import from orm.py
Merge branch 'feature/membership' into develop