deleted:    config.json
Merge branch 'master' of https://github.com/Kolbaskin/tend

Conflicts:
	config.json
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
	modified:   protected/modules/cabinet/view/cabinet.tpl
	new file:   protected/modules/cabinet/view/~cabinet.tpl
	modified:   protected/modules/distinations/view/distinations.tpl
	renamed:    protected/modules/distinations/view/distinations.tpl -> protected/modules/distinations/view/~distinations.tpl
	modified:   protected/modules/docs/view/documentAddForm.tpl
	modified:   protected/modules/docs/view/documents.tpl
        renamed:    protected/modules/docs/view/documentAddForm.tpl -> protected/modules/docs/view/~documentAddForm.tpl
 new file:   protected/modules/docs/view/~documents.tpl
	modified:   protected/modules/orgs/view/organisationForm.tpl
	renamed:    protected/modules/orgs/view/organisationForm.tpl -> protected/modules/orgs/view/~organisationForm.tpl
	modified:   protected/modules/users/view/loginForm.tpl
	modified:   protected/modules/users/view/profile.tpl
	modified:   protected/modules/users/view/registration.tpl
	new file:   protected/modules/users/view/~loginForm.tpl
	renamed:    protected/modules/users/view/profile.tpl -> protected/modules/users/view/~profile.tpl
	renamed:    protected/modules/users/view/registration.tpl -> protected/modules/users/view/~registration.tpl
	modified:   protected/view/inner.tpl
	new file:   protected/view/~inner.tpl
	new file:   static/flash/spark_logo.swf
	new file:   static/flash/spark_rhombus3.swf
	new file:   static/images/10objects.png
	new file:   static/images/back_btm.png
	new file:   static/images/back_btm_navi.png
	new file:   static/images/back_inn.png
	new file:   static/images/blank.gif
	new file:   static/images/bull2.gif
	new file:   static/images/bull3.gif
	new file:   static/images/company_inn.png
	new file:   static/images/fake_counter.jpg
	new file:   static/images/fake_img3.jpg
	new file:   static/images/icon_file.gif
	new file:   static/images/icon_phone.png
	new file:   static/images/icon_print.gif
	new file:   static/images/icon_zoom.gif
	new file:   static/images/icons.gif
	new file:   static/images/inn_page_header1.jpg
	new file:   static/images/inn_rhombus3.png
	new file:   static/images/inn_search.png
	new file:   static/images/inn_side_header_detail.gif
	new file:   static/images/inn_top_line3.jpg
	new file:   static/images/logo.png
	new file:   static/images/menu_btn.png
	new file:   static/images/navi_arrow.gif
	new file:   static/images/navi_toggle.png
	new file:   static/images/special/fifty_years_inner.png
	new file:   static/images/statpro.gif
	new file:   static/js/code.js
	new file:   static/js/print_r.js
	new file:   static/js/swfobject.js
	new file:   static/style/PIE.htc
	new file:   static/style/ie_old.css
	new file:   static/style/inner.css
	new file:   static/style/print.css
	new file:   static/tndr0_reg.html
	new file:   static/tndr1.html
	new file:   static/tndr10_request1.html
	new file:   static/tndr10_request2.html
	new file:   static/tndr10_request3.html
	new file:   static/tndr10_request4.html
	new file:   static/tndr2_cabinet.html
	new file:   static/tndr3_personal.html
	new file:   static/tndr4_company.html
	new file:   static/tndr5_docs.html
	new file:   static/tndr6_categs.html
	new file:   static/tndr7_help.html
	new file:   static/tndr8_open.html
	new file:   static/tndr9_closed.html