Ignore built select2.js
Video block overhaul. Kept the old flash stuff since we need the fallback anyway. Still need to check it on IE8 on windows. Fingers crossedgit add ../web/concrete/blocks/video/edit.phpgit add ../web/concrete/blocks/video/edit.php
formatting tweaks
Removed last code depending on Zend_Locale
Use select2 in user edit
merge
Merge pull request #813 from evancooper/video_block_take_1

Video block overhaul. Kept the old flash stuff since we need the fallbac...
tweaks to css
Merge pull request #814 from mlocati/no-more-zend-locale

Removed last code depending on Zend_Locale
Manually applying fix for jquery right margin, tweaks to select2, composer update
Merge pull request #815 from mlocati/select2-for-timezones

Use select2 in user edit
fixing select2
removing zend locale pointer from repositories
Close #812