Update keypoints
Merge branch 'develop'

Conflicts:
	public/app.css
	public/app.js
Corrigir keypoints