fix tests
add role to user
add news
add web/admin/news controller
add ckeditor
news adding
fix news index
Merge branch 'feature/news' into develop

* feature/news:
  fix news index
  news adding
  add ckeditor
  add web/admin/news controller
  add news
  add role to user
add view for news on main page
add news clicking
add news show
add news index
fix test
Merge branch 'feature/view_news' into develop

* feature/view_news:
  fix test
  add news index
  add news show
  add news clicking
  add view for news on main page
add errors controller
Merge branch 'feature/errors' into develop

* feature/errors:
  add errors controller

Conflicts:
	config/routes.rb
fix news tests
Merge branch 'release/0.3'

* release/0.3:
  fix news tests
  add errors controller
  fix test
  add news index
  add news show
  add news clicking
  add view for news on main page
  fix news index
  news adding
  add ckeditor
  add web/admin/news controller
  add news
  add role to user
  fix tests

Conflicts:
	config/application.rb