change text on welcome page
add update default user
refactoring
Merge branch 'develop' into staging

Conflicts:
	app/controllers/web/admin/news_controller.rb
	app/controllers/web/admin/pages_controller.rb
	app/controllers/web/admin/users_controller.rb