Change site name for Aaron
Merge branch 'develop' of github.com:amanire/tutorial into develop

Conflicts:
	docroot/sites/all/modules/features/site_info/site_info.strongarm.inc