Synced entities model to updated database
Updated Javascript libraries and fixed UI bugs
Merge remote-tracking branch 'origin/justin' into dev