tracking in idashboard should only log json-serializable objects
use unicode instead of str for casting track.views args in idashboard
put block around main_vendor js in main_django.html

should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
Merge remote-tracking branch 'origin/release' into rc/2013-07-16
Make jasmine tests quieter
Missing comma on template -> category refactoring

And several pep8 changes
add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field
Merge pull request #419 from edx/dhm/template_acceptance

Missing comma on template -> category refactoring
Merge pull request #409 from edx/cale/make-jasmine-tests-quieter

Make jasmine tests quieter
Merge pull request #420 from edx/fix/cdodge/hotfix-export-crash

[HOTFIX] add a default XML serialization if the 'data' field is empty or None. So...
Merge pull request #422 from edx/release

Hotfix: 2013-07-17
Merge pull request #396 from edx/jbau/fix/stanford-pwdreset-remove-vendor-js

put block around main_vendor js in main_django.html
Merge branch 'lab' of https://github.com/vetrolamu/edx-platform into lab