Portal Profile fix (#1595)
Fix do_not_deauth param
Revert from previous commit
Fixing #1602
Added alernative between snort and suricata
Logrotate fix
Fixed some typos
epel-release is now 6.8
Merge branch 'devel' into stable

Conflicts:
	conf/httpd.conf.d/captive-portal-cleanurls.conf
	lib/pf/web/constants.pm
Typo in debian changelog
Fix http://packetfence.org/bugs/view.php?id=1621
Fix floating device disablePortSecurity when the port is in PortSecurity with voip
Merge pull request #81 from chris03/stable

Updated the epel repository url
Fixing #1624
Merge pull request #77 from jan-w/patch-1

Fixed some typos
Merge branch 'devel' into stable

Conflicts:
	debian/changelog
Merge branch 'devel' into stable
Merge branch 'devel' into stable
Merge to 4.0.3
Merge to 4.0.4