update
Merge branch 'biostar1' of github.com:ialbert/biostar-central into biostar1