modified for alignment
Merge branch 'master' of https://github.com/photon-infotech/archetypes

Conflicts:
	phresco-drupal6-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-drupal6-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-drupal7-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-drupal7-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-html5-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-html5-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-html5-jquery-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-html5-jquery-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-javawebservice-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-javawebservice-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-php-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-php-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-sharepoint-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-sharepoint-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-sitecore-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-sitecore-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml
	phresco-wordpress-archetype/src/main/resources/archetype-resources/.phresco/phresco-load-test-info.xml
	phresco-wordpress-archetype/src/main/resources/archetype-resources/.phresco/phresco-performance-test-info.xml