add farm and adhoc
Merge branch 'master' of github.com:skmetz/poodnc-oct-2014