Merge branch 'master' of github.com:pwoloszun/jasmine-boilerplate

Conflicts:
	js/app/models/Person.js
	js/app/models/Player.js
	js/app/models/Song.js
	js/spec/init.js
	js/spec/models/PersonSpec.js
	js/spec/models/PlayerSpec.js
	js/spec/models/range_spec.js
	spec.html
minor changes