HPSA-20 Finished
Merge branch 'develop' of https://github.com/dotcreek/hpsa-ng into develop