add cross....20140117.html
Merge branch 'master' of https://github.com/ThissDJ/priceCalculator
Merge branch 'master' of https://github.com/ThissDJ/priceCalculator
Merge branch 'master' of https://github.com/ThissDJ/priceCalculator

Conflicts:
	db.sqlite3
Merge branch 'master' of https://github.com/ThissDJ/priceCalculator
Merge branch 'master' of https://github.com/ThissDJ/priceCalculator

Conflicts:
	db.sqlite3
change product's variationvalues field to be blank =True