my profile updates
Merge branch 'master' of https://github.com/jrussel1/bookSystem

Conflicts:

book.system.android.appengine/src/com/book/system/android/appengine/MyPr
ofileActivity.java