20141215
Merge branch 'master' of github.com:michael34435/PutIO

Conflicts:
	src/KTXP.php
	src/PutIO.php
	src/cmd.php