Main page (tabs added), database table names corrected
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\Euronics\programs\wamp\www\wetask.dev with conflicts.
Main page (tabs added), database table names corrected