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
Merge branch 'master' of https://github.com/cloudspokes/tc-api into dev