Added admin field to Area model;
Features with is_general=True flag now correctly display the Environment as the location to which they are attached.
allowing Area admin to have a null value in api.py (not all area need to be administered)
Client side Location class is now aware of admin field;
Features retrieval now only serializes environment or area fields but not both (since a feature is attached to only one location type)
Fixed bug for annotations with deleted users (happens in the anonymous case)
Further fix of bug for annotations with deleted users (happens in the anonymous case)
Bug fix: on user logout the c2dm_id is now set to None to avoid unwanted messages
Applied unique naming to feature local database support
Custom styling and builder for AlertDialog
fixed facebook erros due to sdk change
port facebook functionality to sdk 3.0
Added admin field to Area model;
Features with is_general=True flag now correctly display the Environment as the location to which they are attached.
allowing Area admin to have a null value in api.py (not all area need to be administered)
Client side Location class is now aware of admin field;
Features retrieval now only serializes environment or area fields but not both (since a feature is attached to only one location type)
added qrcodegen.py and test.py
Applied unique naming to feature local database support
Custom styling and builder for AlertDialog
Area resource hides admin field if it is null
Merge branch 'master' of https://github.com/asorici/envsmth

Conflicts:
	EnvSocialApp/src/com/envsocial/android/features/order/OrderDbHelper.java
	EnvSocialApp/src/com/envsocial/android/features/order/OrderFeature.java
Fixed bug for annotations with deleted users (happens in the anonymous case)
Applied unique naming to feature local database support