Move to sprint
Merge branch 'master' of https://github.com/pericodiaz89/point

Conflicts:
	public_html/js/point_project.js