Add email and phone and address field for People.
Merge branch 'dev' of https://github.com/KatoStoelen/UbiShare into kato

Conflicts:
	source/src/org/societies/android/platform/SQLiteContract.java
added change log.
Added sync properties to entities and updated populate method to set
these properties.
Added support for limiting queries with account type.
Completed the implementation of Sharing.
Merge remote-tracking branch 'dev-upstream/develop'

Conflicts:
	source/src/org/societies/android/platform/SQLiteContract.java