Merge pull request #128 from sigal/develop

update backend/frontend
update frontend
Update prediction.php
update backend/frontend