repaired error table name and not initialized class error
edit
Merge branch 'master' into Tassos
lalal
w