2
Merge branch 'master' into newB

Conflicts:
	zex
3
4
4
nb
nb2
nb3
develop commit changes
new1 commit changes
Merge branch 'new1' into develop
Merge pull request #2 from zexpp5/develop

Develop