fixed problem with Distribution.df
build for shinyapps
conflict with dev

Merge branch 'dev'

Conflicts:
	inst/app/gwstats/shinyapps/gwstats/gwstats.dcf