removed sensitive data
removed files

Conflicts:
	js/service.flickr.js