artf609825: Framework-2:Device Id should display for Device deployment Not for simulator in functional test
Merge branch 'master' of https://github.com/phresco/archetypes

Conflicts:
	phresco-iphone-archetype/src/main/resources/archetype-resources/.phresco/phresco-functional-test-info.xml
	phresco-iphone-hybrid-archetype/src/main/resources/archetype-resources/.phresco/phresco-functional-test-info.xml
artf609825: Framework-2:Device Id should display for Device deployment Not for simulator in functional test