last standing fixes
Merge branch 'master' of https://github.com/fehomeh/insure

Conflicts:
	path/app/Resources/FOSUserBundle/views/Registration/register.html.twig
	path/src/Insurance/ContentBundle/Resources/views/Default/step_one.html.twig
	path/src/Insurance/ContentBundle/Resources/views/Notifications/delayedOrderNotification.html.twig
	path/src/Insurance/ContentBundle/Resources/views/Notifications/payedOrderNotification.html.twig
	path/src/Insurance/ContentBundle/Resources/views/Notifications/unpayedOrderNotification.html.twig