Little Fixes
Use Shine.TimedHTTPRequest
Using Shine.TimedHTTPRequest

Also doing some Cleanup at elorestricted
Merge remote-tracking branch 'origin/develop'