merge dennisoderwald's 670db38 (orf97d0ad?)
merged reqperhulk's c2829b3, 0f62748

(preliminary SSL fix for atv update.)
(Modify the webserver to use threads)
plus some goodies like default settings, sleep()
Merge remote-tracking branch 'upstream/master'
SSL port fix
Merge pull request #116 from alexandrezia/ssl_port_fix

SSL port fix
Merge remote-tracking branch 'upstream/master'