Merge pull request #61 from Sriii/master

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

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

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

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

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

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

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

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

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

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

master to hasan
Merge pull request #77 from Sriii/Varshini's-branch

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

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

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

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

master to hasan
resources, master, contact
resources
Merge pull request #82 from Sriii/Sri's-branch

sri to master
Merge pull request #83 from Sriii/Hasan's-branch

hasan to master