fix
Merge branch 'master' of https://github.com/jmharveys/AdFly

Conflicts:
	public/scripts/min/form.min.js