Fixed Box2D compile on Android. Added Box2D license to the root License.txt file.
Add new build options to control FileWatcher/profiling/logging support.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	License.txt
	Readme.txt