Merge pull request #18 from Sriii/master

master to sri
d-station gallery
edit
biostation + biostationT2
biolite net gallery
biolite net
Merge pull request #20 from Sriii/Sri's-branch

sri to master
Merge branch 'master' of https://github.com/Sriii/HanmanSalesKit
conflict