Merge branch 'master' of
https://github.com/salomax/salomax-framework.git

Conflicts:
	salomax-framework/TODO
Merge remote-tracking branch 'origin/master'