Only check weight/height range if specified
Merge branch 'master' into testing

Conflicts:
	app/models/measurement.rb