update ids.xml public.xml  Constants.java
Merge branch 'master' of github.com:momoplan/Android