Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
Forgot to update phantom-jasmine location for LMS
added number metadata template, cleaned up editor theme ui bordering and settings styles
Merge pull request #2033 from edx/fix-phantom-jasmine-lms

Forgot to update phantom-jasmine location for LMS
Add documentation of xmodule template files
Fix advanced modules list
Merge pull request #2034 from edx/fix/cale/advanced-modules

Fix advanced modules list
Specify version of phantom jasmine to use.
Merge pull request #2035 from edx/fix/zoldak/phantom-jasmine-version

Specify version of phantom jasmine to use.
Fixed database to work on Jenkins (now stored in test_root),
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
Changed module store directory root to test_root/data
pep8/pylint violations fixes
merge master. resolved conflicts in component.py and course.py.
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

Conflicts:
	cms/djangoapps/contentstore/views/course.py
add readme
Add comment service request time logging to Datadog
update readme
Mae mongo DB and collection names consistent for all
acceptance tests.
Merge pull request #2032 from edx/fix/gprice/zendesk-log-error

Add a prefix string to Zendesk errors to be more searchable in Splunk
updated unit styling, added polyfill js library, updated javascript handling for modes swap