The stuff
Merge branch 'GestureData' of https://github.com/stto/InfoSecProj.git
into GestureData

Conflicts:
	GestureLock/src/com/infosec/gesturedata/AccelEvent.java
	GestureLock/src/com/infosec/gesturedata/GestureData.java