Merge branch 'master' into updated_datamart_int

Conflicts:
	flask_restless/search.py