background module improvements
Merge branch 'master' of https://github.com/lacatus/TFM

Conflicts:
	TFM.sublime-workspace