Problem with pulling project.
Conflict one lux-rules.xls, therefore I removed to file.
Merge branch 'master' of https://github.com/HPGurre/lms.git

Conflicts:
	lms/rules/lux-rules.xls