Merge pull request #3 from benitoro/master

front-end code merged with new structure
Merge pull request #4 from benitoro/master

Code merged by Alpha Lu
modify pom to generate war package
re-organize folder structure
re-organize folder structure
re-organize folder structure
Merge pull request #2 from datanium/master

pull from upstream