fixes to registration plugin
Merge branch 'master' of github.com:Techbot/JiGS

Conflicts:
	components/com_battle/views/building/tmpl/default_farm.php