Update dev file
Merge branch 'master' into update-dev

Conflicts:
	dev.php
Merge pull request #67 from fusioneng/update-dev

Update dev file
Merge branch 'master' of github.com:fusioneng/Shortcode-UI into fields

Conflicts:
	dev.php