local
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/org/mengker/dreamdiary/RegisterActivity.class
	gen/org/mengker/dreamdiary/R.java