added entities
Merge branch 'master' of https://github.com/Evrika/Vidal
updates on entities
integrated fos_routing
Merge