update

Signed-off-by: stephan <stephan@kosmogo.com>
Merge branch 'master' of git.ekohe.com:/wulin_master

Signed-off-by: stephan <stephan@kosmogo.com>

Conflicts:
	app/assets/javascripts/jquery_plugins/SlickGrid/slick.editors.js
	db/migrate/20111206070528_create_grid_states.rb
simplify the parameters for auto complete editor to have only one: 'auto_complete'
MISC - grid action authorize processor bugfix
simplify the parameters for auto complete editor to have only one: 'auto_complete'
merge from origin master
MISC - Bring Maxime's changes back
FRAMEWORK - add API set_permission_to_action, for other wulin gems use
MISC - find action in PERMISSION_ACTIONS by string name
FRAMEWORK - add API add_sensitive_action
update float cell editor to enable the value input to be null
BUG FIX: float cell editor not working correctly

* 'master' of git.ekohe.com:/wulin_master:
  FRAMEWORK - add API add_sensitive_action
update select editor to enable selected value to be removed
update auto complete editor to enable input random value
Optimize the functionality of select editor
FEATURE #19763 - Make sure the date time fields work with the keyboard and the arrows.
FEATURE #19763 - Make sure the date time fields work with the keyboard and the arrows.

- also fix for TimeCellEditor
update prompt forbidden message to uppercase
display depend column value immediately after parent column value changes
BUG FIX: remove duplicate value in select editor