Luke - Idk

Really idk
Luke - merged?

I don't know if this worked
Luke - Remove Dialog crap

Removed the Dialog crap, now straight to select screen.
Merge remote-tracking branch 'origin/master' into Luke
luke - random things
Merge remote-tracking branch 'origin/master' into Luke
Luke- things
Merge remote-tracking branch 'origin/master' into Luke
Luke - Stuff
Merge remote-tracking branch 'origin/master' into Luke
yeah
Video playback and start of clip code
Merge remote-tracking branch 'origin/master' into Luke
FANCY SCHMANCY BACKGROUNDS

yeah that's about it
some property thing?
okay property thing go away now
Merge branch 'Pat'

Conflicts:
	Clipsy/gen/com/tsp/clipsy/R.java
Merge branch 'Luke'

Conflicts:
	Clipsy/gen/com/tsp/clipsy/R.java
Merge branch 'Kyle'

Conflicts:
	Clipsy/AndroidManifest.xml
	Clipsy/gen/com/tsp/clipsy/R.java
Fix Manifest so the Editor doesn't crash.