dev update
Merge branch 'dev' of github.com:tlverwijst/Lux

Conflicts:
	default.py