commit before doing remotePaginate
added tinymce
fixed conflict