adding panopoly dependencies
Merge branch 'master' of github.com:albatrossdigital/soar-drops-7
Merge branch 'master' of github.com:albatrossdigital/soar-drops-7
merge conflict