fixed a bug with media folder
Merge branch 'master' into startDirectoryFix

Conflicts:
	trikControl/src/display.cpp
search system.js from the application start directory
Merge branch 'startDirectoryFix' of git://github.com/romankurbatov/trikRuntime
Made working directory be available as command-line argument