modify the way points are randomly chosen
Merge origin/master

Conflicts:
	app/js/services.js