move all frontend and backend template files that start with vaf to vf folder.
add vf/ prefix to templates folders that begin with vaf*
Move catalog template adminhtml files
Modify paths to more phtml files to support structure change
ignore .DS_Store files
Ignore composer.lock
Merge branch 'master' into refactoring/moveTemplates
Change paths for tests to pass from template changes
phpunit.xml to .gitignore, migrate bootstrap-tests.inc.php constants
bootstrap-tests.inc.php now uses $_ENV[] for Constant Variables for Testing Configuration
Merge branch 'master' into refactoring/moveTemplates
Fix merge conflicts.