Applied unique naming to order feature local database support
Custom styling and builder for AlertDialog
fixed facebook erros due to sdk change
Merge branch 'master' into envived-order-app-styling
port facebook functionality to sdk 3.0
Applied unique naming to feature local database support
Custom styling and builder for AlertDialog
Fixed bug for annotations with deleted users (happens in the anonymous case)
Applied unique naming to feature local database support
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.
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)
Area resource hides admin field if it is null
fixed admin field parsing error in client side Location api
Merge branch 'envived-order-app-styling' of https://github.com/asorici/envsmth into envived-order-app-styling

Conflicts:
	EnvSocialApp/src/com/envsocial/android/features/order/OrderFeature.java
	client/views.py
Fixed bug for annotations with deleted users (happens in the anonymous case)
Custom styling and builder for AlertDialog
fixed facebook erros due to sdk change
Applied unique naming to feature local database support
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.
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)