add error message in XML
merge Controller.java
Merge pull request #29 from samzhao88/develop2

new branch