111
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/kelidly/front/index.html
	src/main/webapp/kelidly/front/css/basic.css
	src/main/webapp/kelidly/front/css/style.css