Niewazne zmiany
Merge branch 'master' of github.com:paweljw/engths2013

Conflicts:
	soft/src/tests/mtx_loader.cpp
Merge branch 'master' of github.com:paweljw/engths2013
Merge branch 'master' of github.com:paweljw/engths2013