updated stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	com/lithium/GestureListener.java
first commit