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

Conflicts:
	project.properties