fixed #13, and code review issues
prevented possible error "Maximum call stack size exceeded" for timeProperty observer
Merge branch 'master' of https://github.com/phetsims/friction

Conflicts:
	js/model/FrictionModel.js