changes
Merge branch 'master' of https://github.com/bdrighes/webmining2013

Conflicts:
	website/website/static/javascript/explore/requeteJson.js