Fix warnings on old versions of gcc
Merge branch 'develop' of ssh://git/localhome/GIT/Software/OpenNI2 into develop
Merge branch 'Move_LibJpeg_to_XnLib' into develop

Conflicts:
	Source/Drivers/OniFile/OniFile.vcxproj.filters
	ThirdParty/PSCommon
Fix android compilation
OpenNIView: Moved all GL logic to java (easier to change in derived classes)
OpenNIView: instead of alpha, allow setting the base color
Bug Fix: no logs were printed to the android log
PSLink Bug Fix: 1 mm depth did not apear in supported modes list
OpenNIView: correct draw of cropped frames
Bug fix: potential crash in JpegCodec
Fix indentation
OpenNIView: rename draw() to onDrawGL()
Add FPS calculation to NiViewer
ReleaseVersion script wasn't cleaning before...
Update version to 2.3.0.15
Fix header guards to be compliant with C standard
Merge branch 'release_2.2' into develop

Conflicts:
	Include/OniVersion.h
	NOTICE
	Packaging/Install/Includes/Variables.wxi
	Packaging/UpdateVersion.py
	ReleaseNotes.txt
	Source/Drivers/PS1080/PS1080Console/PS1080Console.cpp