f
f
Merge branch 'master' of github.com:silago/sonata
Merge branch 'master' of github.com:silago/sonata
Merge branch 'master' of github.com:silago/sonata

Conflicts:
	include/libs/templates_c/%%53^53B^53B5BBC2%%checkout.tpl.php
	include/libs/templates_c/%%59^59D^59D38F3A%%login.form.tpl.php
	include/libs/templates_c/%%9B^9BA^9BA472B1%%base.tpl.php
Merge branch 'master' of github.com:silago/sonata

Conflicts:
	include/libs/templates_c/%%53^53B^53B5BBC2%%checkout.tpl.php
	include/libs/templates_c/%%6F^6F7^6F736C41%%bootstrap.html.php
	include/libs/templates_c/%%9B^9BA^9BA472B1%%base.tpl.php
Merge branch 'master' of github.com:silago/sonata
Merge branch 'master' of github.com:silago/sonata
Merge branch 'master' of github.com:silago/sonata
Merge branch 'master' of github.com:silago/sonata

Conflicts:
	css/main.css
	include/libs/templates_c/%%2A^2A4^2A4665F1%%items.main.tpl.php
	include/libs/templates_c/%%60^60E^60E961DB%%users.list.tpl.php
	include/libs/templates_c/%%BC^BC3^BC3C3ACD%%users.edit.tpl.php
f