Merge remote-tracking branch 'origin/master'

Conflicts:
	ButterFly_Red5/src/org/red5/core/Application.java
	ButterFly_Red5/src/tests/ApplicationTester.java
	Butterfly_JavaCV/src/com/butterfly/MediaPlayerActivity.java
Merge remote-tracking branch 'origin/master'