mm
Merge branch 'master' of github.com:hiwifiio/android-viewbuilder

Conflicts:
	gen/io/hiwifi/viewbuilder/R.java
	project.properties