gradle scripts
Merge branch 'master' of
https://github.com/ButterFly-Broadcast/butterfly.git

Conflicts:
	ButterFly_Red5_Tester/src/tests/unit/ApplicationTester.java