manual merge of filters branch
fix property option adding
set height for tinymce fields
Check if cart has been initiated in refresh_cart view
Merge pull request #147 from DNX/master

Check if cart has been initiated in refresh_cart view
Merge pull request #143 from diefenbach/filters_0.8

Manual merge of filters branch.
Fixes all tests.
replace simplejson with json; remove unused imports
Merge remote-tracking branch 'upstream/master'
merge