misc pc 2
Merge commit 'a8b74fb07d61b3a824762e50baa6cd1a698af474'

Conflicts:
	media/engine/lib/cangaja.all.js
	media/engine/lib/cangaja.js