Merge tag '1.0.10.1' into develop

Fix sizing in mobile

* tag '1.0.10.1':
add error pages
add adaptive
add more tests
Merge branch 'feature/error_page' into develop

* feature/error_page:
  add more tests
  add adaptive
  add error pages
Merge branch 'release/1.0.11'

* release/1.0.11:
  add more tests
  add adaptive
  add error pages
Merge tag '1.0.11' into develop

Add mark up for errors pages

* tag '1.0.11':
fix redirecting
Merge branch 'release/1.0.11.1'

* release/1.0.11.1:
  fix redirecting
  add more tests
  add adaptive
  add error pages

Conflicts:
	app/controllers/web/application_controller.rb