R.java
up to date
updates to xml
Merge branch 'master' of https://github.com/jakers/Hermes