some fixes
Merge branch 'master' of https://github.com/lightblue-platform/lightblue
Merge branch 'master' of https://github.com/lightblue-platform/lightblue
Changes for MOngoDB 2.6
Merge branch 'master' of https://github.com/lightblue-platform/lightblue
Merged with latest changes