TH-10 | Added settings button (logout and music control)
 TH-03 | Client-side validation
Merge remote-tracking branch 'origin/TH-03' into dev1.0
Merge branch 'TH-10' into dev1.0
modified th-09
fixed conflict