Created new components for the scraper.

Started new yml for doctrine models.
Removed all cache files & logs that are un-necessary in the repo and are causing merge conflicts.

Modified service container & installed bootstrap 3 w/ core theme.

Routes modified.
Removed cache and logs from repository -- (they are causing conflicts and are do not need to be tracked)
Merge branch 'master' of https://github.com/snipertomcat/jobeet2 into TheDesignAffiliatesInc-master

Conflicts:
	.gitignore
removed .gitignore from repo
yep
removed cache & logs dir from repo
gitignore
Merge branch 'master' of https://github.com/TheDesignAffiliatesInc/jobeet2 into TheDesignAffiliatesInc-master

Conflicts:
	.gitignore
	Symfony/app/cache/dev/appDevDebugProjectContainer.php
	Symfony/app/cache/dev/appDevDebugProjectContainer.php.meta
	Symfony/app/cache/dev/appDevDebugProjectContainer.xml
	Symfony/app/cache/dev/appDevDebugProjectContainerCompiler.log
	Symfony/app/cache/dev/appDevUrlGenerator.php
	Symfony/app/cache/dev/appDevUrlGenerator.php.meta
	Symfony/app/cache/dev/appDevUrlMatcher.php
	Symfony/app/cache/dev/appDevUrlMatcher.php.meta
	Symfony/app/cache/dev/assetic/routing.yml
	Symfony/app/cache/dev/classes.php
	Symfony/app/cache/dev/classes.php.meta
	Symfony/app/cache/dev/profiler/index.csv
	Symfony/app/logs/dev.log
	Symfony/composer.lock
	Symfony/composer.phar
	Symfony/src/Stc/ScraperBundle/Resources/config/doctrine/Website.orm.yml
	Symfony/src/Stc/ScraperBundle/Resources/config/routing.yml
	Symfony/src/Stc/ScraperBundle/Resources/config/services.yml
	Symfony/src/Stc/ScraperBundle/Resources/public/css/bootstrap.css
	Symfony/src/Stc/ScraperBundle/Resources/public/js/bootstrap.js
	Symfony/src/Stc/ScraperBundle/Resources/views/Admin/index.html.twig
	Symfony/src/Stc/ScraperBundle/Resources/views/layout.html.twig
Removed un-needed files from repo
For Jesse
Merge pull request #3 from snipertomcat/TheDesignAffiliatesInc-master

The design affiliates inc master
Added fixture to vendors & created 1st data fixture : LoadFeedsData.php (for feeds table).

Added eko/feedbundle to vendors.

Made some modifications to the admin layout & performed a small test in the AdminController on the data data models. Moved the old Controller/ScrapeContentController.php and Controller/ScrapeStatusController.php files & replaced them with 2 respective module classes inside a new namespace : Stc\ScraperBundle\Model.

Created new "feeds" table schema & updated database.

Created new service definition (services.yml) for the status model.
Created new service def. (config.yml) for the new feed bundle.

**Note** The commented out code in the CoreController.php is a test to check the compatibility of the new models and the Components\Lib*.php files.

@todo : Add a "Lib" folder (namespace) under the Components directory & put the Lib*.php files in it.
Getting repo up to date with other branches
Merge pull request #1 from snipertomcat/master

getting branches merged and up to date