Update 13/04 17:48 by K

- Mini update for admin
Merge pull request #9 from mrcupid12/master

A
Update 14/04 00:56 by K

- Mini update for some files
Merge pull request #43 from kelvinlee93/master

merged 13/04 17:48 by K