Updating the zpanelx theme
Just altering the script call path as the master.ztml
Removal of duplicate html tags
Update master.ztml
The script paths have to be hard coded in.
Merge branch 'master' of https://github.com/PS2Guy/zpanelx-nz

Conflicts:
	dryden/ui/tpl/modulelistznavbar.class.php
	etc/styles/zpanelx/fonts/fontello-codes.css
	etc/styles/zpanelx/fonts/fontello.css
	etc/styles/zpanelx/fonts/old/fontello-codes.css
	etc/styles/zpanelx/fonts/old/fontello.css
	etc/styles/zpanelx/inc/jquery.min.js
	etc/styles/zpanelx/inc/jquery.qtip.min.js
	etc/styles/zpanelx/master.ztml
	modules/dns_manager/code/controller.ext.php
	modules/htpasswd/assets/js/connectors/jqueryFileTree.php
	modules/htpasswd/assets/js/jquery.js
	modules/htpasswd/code/controller.ext.php
	modules/htpasswd/module.zpm
Updating the icon's from Bootstrap to ZPanel
Update master.ztml
Merge pull request #45 from PS2Guy/master

Changing the icon's from Bootstrap to ZPanel.