Jeff - now we can test an activity
Merge branch 'master' of github.com:chailmis/chailmis-android