orm for installation
popup added
Merge branch 'master' of github.com:gonzaparra/webankyrins

Conflicts:
	src/LFP/StructuralAnks/MainBundle/Controller/HomeController.php
	src/LFP/StructuralAnks/MainBundle/Resources/config/routing.yml
	src/LFP/StructuralAnks/MainBundle/Resources/views/Home/browse.html.twig
	src/LFP/StructuralAnks/MainBundle/Resources/views/Home/show.html.twig
Merge branch 'master' of github.com:gonzaparra/webankyrins

Conflicts:
	src/LFP/StructuralAnks/MainBundle/Controller/HomeController.php
	src/LFP/StructuralAnks/MainBundle/Resources/config/routing.yml
	src/LFP/StructuralAnks/MainBundle/Resources/views/Home/browse.html.twig
	src/LFP/StructuralAnks/MainBundle/Resources/views/Home/show.html.twig