syntax fix
Merge github.com:Khelek/hashtech-ru into develop

* github.com:Khelek/hashtech-ru:
  bundle for travis
  working projects fotorama
  nostable
  half-stable version of fotorama
  slideshow with jquery.rs.slideshow.js
  move admin tests
  delete temp links test
  i will be writing tests i will be writing tests i will be writing tests
  welcome, partners and projects controllers, and welcome index view

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
remove index.html
remove comments from routes.rb
Merge branch 'hotfix/v0.2.4'
fix routes.rb
Merge branch 'develop' of github.com:Khelek/hashtech-ru into develop

* 'develop' of github.com:Khelek/hashtech-ru:
  add db:test:prepare command to travis
  delete assets from gitindex and move css and js include to end of file
  create screenshots of in the admin panel
  corrected routes
  delete :id from models
  Revert "bundle for travis"
  bundle for travis

Conflicts:
	config/routes.rb
Merge branch 'release/v0.2.5'
Merge github.com:Khelek/hashtech-ru into develop

* github.com:Khelek/hashtech-ru:
  add validates to models
  add state machine

Conflicts:
	Gemfile.lock
remove comments from devise init
remove .swp file
add *.swp files to gitignore
add secret key to devise