Merge commit '499bb500e0ced58cd833b3b56064cb1113749529'
Merge commit 'a42da588c9cd5f351a4613a4d61667d2f7872961'
Merge commit '4491ff7ad144f698d44b52726ab47b4f1d27601d'
Merge commit '2acdd3549299885e1fe32ee3e2b59b0d4bc8b4f5'
Merge commit '8b3fb933cd9ca9effb89339a1213b59b612c4c79'
Fixed missing show.html.twig for FOS Profile
Merge branch 'master' of https://github.com/colombbus/tangara-ui

Conflicts:
	app/Resources/FOSUserBundle/views/Registration/Profile/show.html.twig
Re-introduced show.html.twig
Merge commit '0af64a907ac1da6c6a676ae4fd27288c4d76ce7f'
Merge commit '3aeb5a4fce84e6d1bbf7819ee46ee0f38e1dfde7'
Merge commit '7c3d135294c9ed699e9b91dbd359cfad3d3c62ea'
Merge commit '894eddb2bbc2c82d33b54c3a91ab26fd52ab5013'
Merge commit '76ce54933c18e757882d2776804233057b0e2136'
- Added Help panel
Fixed parameter name
Fixed parameter setting