UPDATE: Copyright
FIX: Added sagePort to SageInputServer configuration file
Merge branch 'SAGEInputServer'
Merge branch 'master' of https://github.com/uic-evl/omicron

Conflicts:
	src/apps/sageinputserver/sageinputserver.cpp
Update osystem.h

add omicron namespace to oassert when not using namespace omicron
Update otypes.h

change int64 from unsigned long long to long long
Merge pull request #17 from sufulow/master

fix int64 typedef and oassert
FIX:VS2012 build
NEW: Rect.size
Merge branch 'master' of https://github.com/febret/omicron
NEW: MSKinectService updated for Kinect for Windows SDK v2.0
NEW: MSKinect2Service generates mocap events
NEW: MSKinect2Service sends hand states in event orientation ( w = left hand, x = right hand)
CHANGE: Added additional Omicron Skeleton Joints for Kinect2 thumbs.
FIX: oinputserver properly unlocks event list
untabify
NEW: Rect != and == operators
Merge branch 'master' of https://github.com/febret/omicron
NEW: MSKinect2Service speech recognition
NEW: MSKinect2Service generates and sends Speech events
Merge branch 'master' of https://github.com/uic-evl/omicron
FIX: Kinect SDK v1.x skeleton tracking
FIX: MSKinectService v1.x speech recognition support