D-2(m)

v-4.0
---
1. setup for words#index
	==> done
Merge branch 'master' into D-2_create-tables

Conflicts:
	app/Model/Lang.php
	app/View/Elements/langs/index_links.ctp
	app/View/Elements/texts/index_links.ctp
	lib/log/log.txt
D-2

v-4.1
---
1. build words list
	==> Problem occurred
D-2

v-4.1_p1
---
1. build words list
	==> done