Removed dependancy on livestamp
Merge remote-tracking branch 'origin/1.1' into 1.1

Conflicts:
	Resources/views/Default/base.html.twig