the client is now pushing its changes to the service
Merge branch 'master' of github.com:ldornin/migrate-client

Conflicts:
	android/migrate-client/src/com/migrate/webdata/syncadapter/WebdataSyncAdapter.java
we dont need to require api 17, only 16