initial commit for dev_2
modifed
modifed for dev_2
Merge branch 'dev_2' into dev_1

Conflicts:
	index.txt