* changes on orange computer
Merge branch 'unstable' of https://github.com/fiezi/Moviesandbox into unstable

Conflicts:
	Moviesandbox.exe
	classes/input.cpp
	config.xml
	shaders/post/post.frag

* fixed conflicts