meanshift : get clusters
Merge branch 'master' of https://github.com/2014-codeteam/2014-codeteam

Conflicts:
	trial/parser.py
meanshift: paint
Merge branch 'master' of https://github.com/2014-codeteam/2014-codeteam

Conflicts:
	trial/parser.py
Merge branch 'master' of https://github.com/2014-codeteam/2014-codeteam