lots of moving of stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	avp-droid/src/uk/co/rossbeazley/avp/android/application/Application.java
	avp-droid/src/uk/co/rossbeazley/avp/android/ui/videoplayer/VideoOutputScreenMediator.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
moving the design towards a simpler fragment design?