Cherry pick change to url matching regular expression. Fixes LMS-37
Fix a few remaining tz naive dates

And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
Fix a few remaining tz naive dates

And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
Merge branch 'dhm/timeconv/bug0' of github.com:edx/edx-platform into dhm/timeconv/bug0

Conflicts:
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/timeinfo.py
timezone conversion tests
timezone conversion: more unit tests

and code reorganization
need to import os
Merge pull request #195 from pdehaye/patch-1

need to import os
remove assets.js from the PIPELINE_JS since it seems to cause that file to be loaded twice
actually, seems like if we remove it from PIPELINE_JS then it doesn't work in production
Make the variable and method names clearer
Merge pull request #183 from edx/dhm/timeconv/bug0

Fix a few remaining tz naive dates
Update fields.py

When changing variable names for code review critique, accidental cut/paste prevented intended behavior.
Merge pull request #201 from edx/fix/cdodge/fix-busted-JS-pipeline

remove assets.js from the PIPELINE_JS since it seems to cause that file ...
Merge pull request #150 from edx/fix/cale/update-django-wiki

Cherry pick change to url matching regular expression. Fixes LMS-37
Merge branch 'master' into peter-fogg/remove-video-xml