Merge branch 'kohata-i-127741-api-timeout' into technology-2014-10-02
Merge branch 'technology-2014-10-02'
update apiary from dev branch
I-131385 challenge_duration check
Merge branch 'thabo-I-132651-500-error-on-challenges-rss' into technology-2014-10-09
Merge branch 'technology-2014-10-09'
Merge remote-tracking branch 'origin/technology-2014-10-16'
Merge branch 'technology-2014-10-16' of https://github.com/cloudspokes/tc-api into thabo-I-129863-new-registration-emails
submission link for design submissions needs to stay at existing link until new page is created
submission link for design submissions needs to stay at existing link until new page is created
Merge branch 'thabo-I-129863-new-registration-emails' of https://github.com/cloudspokes/tc-api into dev
Merge branch 'technology-2014-10-16' of https://github.com/cloudspokes/tc-api into dev
Merge branch 'technology-2014-10-16' of https://github.com/cloudspokes/tc-api
Merge branch 'master' of https://github.com/cloudspokes/tc-api into dev
interim solution for practice problem query performance issue, fixing practice problem query to return only practice rounds
I-135068 member seach count incorrect
Merge branch 'dev' of https://github.com/cloudspokes/tc-api into dev
updating practice problems query
Merge pull request #379 from Ghost141/dev

Update search challenges api and fix some jslint error.
I-135595, removed setting sslv3.