merge commit
merge conflicts fixed
added low/high pass filter to accelerometer function
added media stop delay of 5 minutes, tested.
mucking with the progress bar