Merge pull request #38 from oslabs-beta/nathan

two commits; alert bug in server side and process logs and volume history bugs in client

Author: WongJonathann