Merge pull request #317 from mhotan/phase_4_dev

Fixed issues
Fixes classcastexception for arrow on user side
Merge pull request #320 from glee23/master

Fixes classcastexception for arrow on user side
Merge branch 'master' of https://github.com/blasv/DineOn into phase_4_dev