fixed other misc merge conflicts
Merge branch 'master' of github.com:caosuomo/rads