Add Shrek is Love, Shrek is life
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/routes