Merge pull request #112 from msaeedi/master

MOBSDK-486
Fix compilation issue and tweaked run_test.sh
Merge pull request #115 from gavincornwell/master

Fix compilation issue and tweaked run_test.sh
Merge branch 'master' of https://github.com/Alfresco/alfresco-ios-sdk

Conflicts:
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoDocument.m
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoFolder.m
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoNode.m
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoProperty.m
MOBSDK-486: issue with multiple constants with same name is resolved
Merge branch 'topic-MOBSDK-486'

Conflicts:
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoDocument.m
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoFolder.m
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoNode.m
	AlfrescoSDK/AlfrescoSDK/Model/AlfrescoProperty.m