Merge branch 'dev2' into develop

Conflicts:
	components/View.class.php
	templates/default/patchworks_view_edit_base.html
	templates/default/patchworks_view_main_init_default.html
	view/edit/base/Base.class.php
	view/edit/config/Config.class.php
	view/main/init/Init.class.php
Merge branch 'develop' of https://github.com/zanjibar/patchworks into develop

以下、コンフリクトに対しての修正。
dev2 にあがっていた内容を developブランチに反映。
いくつかのソースの整備を再実行。

Conflicts:
	components/View.class.php
	templates/default/patchworks_view_edit_base.html
	templates/default/patchworks_view_main_init_default.html
	view/edit/base/Base.class.php
	view/edit/config/Config.class.php
	view/main/init/Init.class.php
Merge branch 'master' of https://github.com/zanjibar/patchworks
Merge branch 'release/0.1.1'