Merge pull request #1 from CE-KMITL-CLOUD-2014/master

merge
Merge pull request #2 from CE-KMITL-OOAD-2014/master

Merge pull request #1 from CE-KMITL-CLOUD-2014/master