test summary
Merge remote-tracking branch 'origin/master'

Conflicts:
	allianz/css/test.css
final commit