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)
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
Merge branch 'master' of https://github.com/asorici/envsmth

Conflicts:
	EnvSocialApp/src/com/envsocial/android/features/order/OrderTabFragment.java
Merge branch 'master' into f/refactoring_feature_presentation

Conflicts:
	EnvSocialApp/src/com/envsocial/android/features/order/OrderDbHelper.java
	EnvSocialApp/src/com/envsocial/android/features/order/OrderFeature.java
Merge branch 'envived-aiwo' into f/refactoring_feature_presentation

Conflicts:
	EnvSocialApp/src/com/envsocial/android/features/order/OrderFeature.java
set HOSTNAME and BASE_URL to right values
Merge branch 'envived-aiwo' of https://github.com/asorici/envsmth into envived-aiwo
Merge branch 'envived-aiwo' into f/refactoring_feature_presentation
Fixed a typo and added the initial GridView implementation
Refactored DetailsActicity to display a GridView of the features instead of using tabs.
Changed DescriptionFeatures from Fragment to Activity.
Updates in branch after rebase conflicts