allowing for form options
prep the next version
move default upload location back to /tmp
spelling
add a note about running in development mode
add a note about running in development mode (notice)
reload params when actions are reloaded in development mode
Merge remote-tracking branch 'upstream/master'

Conflicts:
	initializers/actions.js
	initializers/params.js
reload params when actions are reloaded in development mode