add bean
add listactivity
barberlist
save
save more
Merge remote-tracking branch 'origin/CSSPeter'

Conflicts:
	src/com/blackswan/fake/base/BaseApplication.java
Merge remote-tracking branch 'origin/master' into jzp