added rbx to .travis.yml
updated colorbox
updated jquerymobile
fixed assets
fixed setting request format
fixed setting format
Merge branch 'master' into rails4.1

Conflicts:
	lib/enju_leaf.rb