update readme travis badge
fix the render control in template
addition of touch-punch js
add touch punch js to simple layout
Update the nestedSortable js
Override the default role listing
Make sure the btn-default is used where no style is otherwise defined
Merge remote-tracking branch 'origin/master' into 2.5

Conflicts:
	README.md