link removed
Merge branch 'hotfix/remove_link_from_main_page'

* hotfix/remove_link_from_main_page:
  link removed
Merge branch 'hotfix/remove_link_from_main_page' into develop

* hotfix/remove_link_from_main_page:
  link removed
  production user changed
  fix regex
remove tabs
remove but tshirt
new logos
add table
remove ticket_price for first and second day
Merge branch 'hotfix/rename_tabs'

* hotfix/rename_tabs:
  remove ticket_price for first and second day
  add table
  new logos
  remove but tshirt
  remove tabs
Merge branch 'hotfix/rename_tabs' into develop

* hotfix/rename_tabs:
  remove ticket_price for first and second day
  add table
  new logos
  remove but tshirt
  remove tabs
new map on annonce page

add 2 new pics
Merge pull request #1 from ysvistunova/new_resources

new map on annonce page
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  stub removed
  unicorn config workdir changed
  production unicorn workdir changed
  app name changed
  fix remind password errors messages
  fix sponsors

Conflicts:
	public/images/logo-interra.jpg
	public/images/logo-itm.jpg
	public/images/logo-mst.jpg
	public/images/logo-mymedia.jpg
	public/images/logo-platidoma.jpg
	public/images/logo-turnkey.jpg
	public/index.html
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix tests
  fix regex
  restore public
  new map on annonce page

Conflicts:
	public/index.html
fix tests
Merge branch 'develop'

* develop:
  fix tests
  fix tests
  fix regex
  restore public
  new map on annonce page
  stub removed
  unicorn config workdir changed
  production unicorn workdir changed
  app name changed
  fix remind password errors messages
  fix sponsors
fix main page
Merge branch 'hotfix/fix_main_page'

* hotfix/fix_main_page:
  fix main page
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku: