Merge
Merge branch 'master' of https://github.com/sloan58/nac-wirify

Conflicts:
	.idea/workspace.xml
	includes/functions.php