AI2787: implement tinymce etherpadlite plugin
Merge branch 'AI2787' of https://github.com/dtygel/noosfero-ecosol into ai2787
Support passenger

Conflicts:
	Gemfile
Merge branch 'easysafeinstall' of git://github.com/coletivoEITA/noosfero-ecosol

Conflicts:
	Gemfile
	config/environment.rb
Update Gemfile
Update Gemfile
Add progressbar
Merge branch 'master' of https://github.com/blogoosfero/noosfero into blogoosfero
Send more data on user_data
Disable js and css cache
Merge branch 'stable' of https://gitlab.com/noosfero/noosfero into blogoosfero
Protect against non UTF8 chars
Allow solr plugin enable
Add themes submodule
Make javascripts/stylesheets cache an option

Conflicts:
	app/helpers/layout_helper.rb
Fix default value load
Merge branch 'stable' of https://gitlab.com/noosfero/noosfero into blogoosfero
Merge branch 'stable' of https://gitlab.com/noosfero/noosfero into blogoosfero
Remove invalid submodule
Rescue migration error