friction added

friction working fine
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/GGI/physics/World.java