This is to address feedback and should go into build 20130716
Merge branch 'Build20130716'

Conflicts:
	BooktPHP/bapi.php