pppj -> jtres
Merge branch 'master' of github.com:brachior/pppj-2014

Conflicts:
	android292.tex