FIx fields and Plugins
Merge branch 'release-0.2.1-alpha' of git@github.com:GoliathUA/JF into release-0.2.1-alpha

Conflicts:
	bundle/plugins/DisplayPlugin.php