Allow for skipping of ads after x seconds
Merge branch 'master' into eve