Working on homePage ui (testimonial)
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/templates/layout/navigation/navigation.coffee