travis config

Conflicts:
	.gitignore
	.travis.yml
	config/database.yml.travis
slim
bootstrap
close web from non authenficated users
create db:seed
simple form
Merge pull request #8 from wat32/simpleform

slim
Merge remote-tracking branch 'origin/dev' into dev
nazvat stolbec v modely - type bila plohaya ideya
Merge remote-tracking branch 'origin/dev' into dev
add pre_testing
add gem 'rails-i18n' for translation rails
add to be green factory.
----
to be: Add user relation check
add test file to upload
include type to test
Merge remote-tracking branch 'origin/factory_test' into factory_test

Conflicts:
	spec/factories/documents.rb