Merge branch 'search_api' of github.com:evillemez/AyamelResourceApiServer into search
Merge branch 'search_api' of github.com:evillemez/AyamelResourceApiServer into search
add dev fml client
disable auth check in UploadContent controller
Merge branch 'search' of github.com:AmericanCouncils/AyamelResourceApiServer into search
remove debug code
don't require key in UploadContent
Merge branch 'search' of github.com:AmericanCouncils/AyamelResourceApiServer into search
remove old tests for upload content api key
Merge pull request #177 from cmac1000/search

Search