add master base and layout templates for admin
change to route naming
update composer.lock
use the templates in the product bundle
update the form type to sf2.1
updated
Merge remote-tracking branch 'upstream/master'
add VespolinaSymfony2Bundle to kernel
update to iampersistent repo
change the base class
update for change in class name from Feature to Attribute
update composer
Fixed composer update & TermInterface in Product.php
composer updates
move ProductManager to ProductBundle
Use assetic package definition
Started with adjusting to to match refactored bundles
Merge branch 'refactor'

Conflicts:
	app/AppKernel.php
	composer.json
	composer.lock
	src/Application/Vespolina/ProductBundle/Document/Product.php
Got sandbox working
plug twsbootstrap