Small changes
Merge branch 'master' of https://github.com/icedaq/uzs

Conflicts:
	application.e