cambios
Merge branch 'master' of https://github.com/lnx1337/airos

Conflicts:
	protected/runtime/application.log