modified:   templates/default/patchworks_view_edit_list.html
	modified:   templates/default/patchworks_view_main_init_2.html
Merge branch 'master' of github.com:zanjibar/patchworks

Conflicts:
	templates/default/patchworks_view_main_init_2.html

	modified:   patchs/3.php
	deleted:    templates/default/patchworks_view_main_init_2.html
	modified:   templates/default/patchworks_view_main_init_3.html
	modified:   templates/default/patchworks_view_main_login.html
	modified:   view/dicon.ini
	new file:   patchworks_view_main_init_2.html
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:zanjibar/patchworks
Merge branch 'develop'
	modified:   components/View.class.php