#136 fixed Nape rising issues
Merge branch 'master' of https://github.com/alamboley/Citrus-Engine

# By Aymeric
# Via Aymeric
* 'master' of https://github.com/alamboley/Citrus-Engine:
  #136 fixed Nape rising issues

Conflicts:
	src/citrus/objects/platformer/nape/Hero.as
	src/citrus/physics/nape/NapeContactListener.as