Removed old test data and added "" to times keys
Fix conflict

Conflicts:
	www/js/services.js