3.6.3
Merge branch 'master' of https://github.com/katzwebservices/Gravity-Forms-Directory

Conflicts:
	template-row.php
Remove template-row.php.txt