Added missing files
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/sopamo/triangula/android/MainActivity.java
Update for Spike Movement
Another Update for Spikes
fixes:
music can be played , paused and resumed
merge