Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from hairizalman/master

merge from hairizalman/myspata
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/dianaismail/myspata
update for skop aktiviti pnpa & ptra
borang pla 1b1c

included calculation bajet aktiviti
Merge pull request #30 from dianaismail/master

change 1b1c in pnpa,ptra, popa & added  1b1c in pla