Merge pull request #38 from Sriii/master

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

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

master to varshini
Merge pull request #44 from Sriii/master

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

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

master to varshini
Merge pull request #50 from Sriii/master

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

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

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

master to varshini
pics
Merge pull request #55 from Sriii/Sri's-branch

sri to master
merge
Merge pull request #57 from Sriii/Varshini's-branch

varshini to master
Merge pull request #58 from Sriii/TeoHuei's-branch

teohuei to master
Merge pull request #59 from Sriii/Hasan's-branch

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

master to sri