added sampler instrument - not tested yet
Added sampler
sampler.png added
sampler plugged into menu
Merge branch 'master' of https://github.com/toumix/musical-fingers into toumix-master.
Note that all this code (except for a few bugs discovered and fixed during testing with the LM) is Alexis's work.
I'm just resolving the merge conflict.

Conflicts:
	Musical-fingers/src/ox/musicalfingers/display/InstrumentScreen.java
	Musical-fingers/src/ox/musicalfingers/display/LoadingScreen.java