cleaning
Merge branch 'devel'
security
quick temp fix
width fix
weather conditions width temp fix
trim function
Merge branch 'master' into devel

Conflicts:
	remote.py