Merge pull request #86 from Sriii/master

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

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

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

master to marc
HG
cant resize some of the font.

thank you sri.
redo rim and deadbolt font size discrepancies!

no need sri to assist
hh
jh
lk
ll
yeayea
commit
Merge pull request #91 from Sriii/Varshini's-branch

varshini to master
commit
merge
Merge pull request #92 from Sriii/Sri's-branch

sri to master
Merge pull request #93 from Sriii/Marc's-branch

marc to master
Merge pull request #94 from Sriii/Hasan's-branch

hasan to master
Merge pull request #95 from Sriii/TeoHuei's-branch

teohuei to master