first try
change ui of table
backend a little change
Merge branch 'alice' of github.com:Haposola/FUTR_Team_Project into alice
ok merge
merge alice ok
confirm stage 1
ok, ite2 is fineshed for me
ok
merge ok
merge alex into dev
change