Adding tangle list
hardcode bugs
Merge branch 'el_3mlya_nesr' of https://github.com/ndomar/megasoft-14 into el_3mlya_nesr

Conflicts:
	Entangle/entangle-symfony/public/src/entangle/src/Megasoft/EntangleBundle/Resources/config/routing.yml