Merge branch 'master' of https://github.com/kevinlawcb11106/SDD2013_IntechEzyinet.git