Fixed picking
quick fix
fix
Work work
Merge branch 'master' of https://github.com/circlingthesun/Masters

Conflicts:
	.gitmodules
	cloudclean/thirdparty/EigenLibSVM
work work
work
work