certificate file and password for the certificate are read from properties file instead of being hardcoded. It doesn't work due to uses conflict with dependencies
Merge branch 'development' into MitjaSecurityServicesConfigProperties

Conflicts:
	platform-infrastructure/security/SecurityServices/pom.xml
Merge branch 'development' into MitjaSecurityServicesConfigProperties
Merge branch 'development' into MitjaSecurityServicesConfigProperties
Merge branch 'development' into MitjaSecurityServicesConfigProperties
Merge branch 'MitjaPolicyNegotiator' into MitjaSecurityServicesConfigProperties
External ContextBroker Interface and context model for android.
Implement android API CtxIdentifiers (Entity, Attr, Assoc) and
CtxModelObjet using Parcelable.
Updated the Android library dependency
Add icon for general social network
incremented javadoc plugin to 2.8.1
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform into development
Merge branch 'development' into MitjaSecurityServicesConfigProperties
Added description. No functional changes.
Merge branch 'MitjaPolicyNegotiator' of https://github.com/societies/SOCIETIES-Platform into MitjaPolicyNegotiator
Merge branch 'development' into MitjaSecurityServicesConfigProperties
Parcel all context model.
Include string client in external brokers interface for android.
Changed Activity ID as <socialnetwotkname>:id to identitfy from which
SN it belongs
Added provider info in the Person Converter
Bug fixing of Socialdata UI and ContexGUI