releasing squid 3.1.7
releasing firewall 3.1.7
releasing trafficshaping 3.1.3
releasing ftp 3.1.4
releasing software 3.1.5
releasing remoteservices 3.1.9
releasing captiveportal 3.1.6
releasing network 3.1.6
releasing samba 3.1.14
releasing core 3.1.13
releasing zarafa 3.1.6
releasing users 3.1.11
Merge branch 'master' into jacalvo/3.2-final-changes

Conflicts:
	main/captiveportal/ChangeLog
	main/core/ChangeLog
	main/firewall/ChangeLog
	main/ftp/ChangeLog
	main/network/ChangeLog
	main/remoteservices/ChangeLog
	main/samba/ChangeLog
	main/software/ChangeLog
	main/squid/ChangeLog
	main/trafficshaping/ChangeLog
	main/users/ChangeLog
	main/zarafa/ChangeLog