Merge pull request #15 from Sriii/master

master to hasan
Merge pull request #16 from Sriii/master

master to marc
Merge pull request #18 from Sriii/master

master to sri
Merge pull request #19 from Sriii/master

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

sri to master
Merge branch 'master' of https://github.com/Sriii/HanmanSalesKit
conflict
Merge pull request #22 from Sriii/Hasan's-branch

hasan to master
Merge pull request #23 from Sriii/Marc's-branch

marc to master
Merge pull request #24 from Sriii/Varshini's-branch

Merge pull request #17 from Sriii/master
Merge pull request #25 from Sriii/TeoHuei's-branch

teohuei to master
Merge pull request #30 from Sriii/master

master to varshini