fixed db timeout issues
Merge branch 'master' of https://github.com/csreid/stocks-portal
Merge branch 'master' of https://github.com/csreid/stocks-portal
fixed ordering