Update challenges api

1. Update challenge type filter to allow multiple challenge type in query.
Merge remote-tracking branch 'upstream/master' into challenges_api_update
Update challenge type filter.
Merge remote-tracking branch 'upstream/master' into challenges_api_update

Conflicts:
	actions/challenges.js
Merge pull request #302 from Ghost141/challenges_api_update

Update challenges api