commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	LiliShowcase/pom.xml
Fix bug on sort
It's possible now to have empty title if name is set
Fix on logo path in index.html