Merge branch 'develop'
Na feature
Merge branch 'develop' into feature

Conflicts:
	ei
Merge pull request #7 from mira/feature

Feature