solve MAP label confusion
Merge branch 'dev' of https://github.com/tqchen/xgboost into dev

Conflicts:
	regrank/xgboost_regrank_obj.hpp