fix capa optioninput template to honor inline flag
Skip acceptance test DB migrations if the DB already exists and running fasttest_acceptance
Merge pull request #836 from edx/will/fix-video-caption-tests

Updated acceptance tests to match new behavior in video captions.
Verification: adds in progress styling support based on body classes
Verification: removes physical sizes from HTML templates and adds placeholder hooks
Image capture support for non WebRTC compliant browsers, via Flash.
Verification: add in I8TN support for new templates
Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3

Conflicts:
	lms/templates/verify_student/photo_verification.html
add warning message to make sure image capture canvas attributes aren't removed
Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3
Add acceptance tests for multiple files
Verification: addresses regression of missing 'registering as:' copy
Incremented diff cover version to fix 100% coverage bug.
Merge pull request #847 from edx/will/fix-diff-cover

Incremented diff cover version to fix 100% coverage bug.
add pyparsing explicitly to sandbox requirements
Initial BDD spec for certificates workflow
Implemented fake payment page.
Change CSS after rebase.
Automate more scenarios
add pyparsing to edx requirements