rejiggered migration order
temporary migration hack
undoing temporary migration hack
added multiple stage config to deployment script
fixed missing translation key
tweaked deploy script for asset precompilation
fixed option set controller bug
removed ordering and value columns, added option setting ranks, added option set ensure_rank and test, removed some references to ordering/value
updated odk xml generation to use new 'rows' attrib for long text question boxes
removed form type
removed option_set.create_default and option.create_simple_set
fixed a stray reference to form type
fixed option sorting in reports; removed sorted_options and ensured proper new option sorting; added unit test for question answer tally report with select multiple; moved report test helpers into own file; removed some more occurrences of option.value and option_set.ordering
removed all other occurrences of option_set.ordering and option.value, except for in form versioning policy
fixed form versioning policy; added ordering for option_set's option_settings association
started new option set form; refactored parts of nice_form
added 'add' box with token input interaction
added client side session timeout; fixed some n+1 stuff in the user controller
made welcome blocks a bit taller to account for french
added available_locales method to translatable