Squashed commit of the following:

commit 3915b5c0a64aebd705240cf7ec0a9dabd1075438
Merge: 7e02a49 d3d5c1d
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Tue Jun 18 19:05:59 2013 +0200

    Merge branch 'master' into feature-otrsticketacleditor-mab-master

    Conflicts:
    	scripts/database/update/otrs-upgrade-to-3.3.xml

commit 7e02a4908c59a0644ecd9ed8760920280329a7ff
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Tue Jun 18 19:02:53 2013 +0200

    Added script for initial import of ACLs.

commit 2bd9ad9adb7178dc73fd36d2718e16f06a0c9c3d
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Tue Jun 18 10:09:22 2013 +0200

    Changed column type to SMALLINT for stop_after_match.

commit 8bd774448997ade2324d87fdb2e7908caa85a838
Merge: 8c65b63 340736a
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Tue Jun 18 10:07:35 2013 +0200

    Merge branch 'master' into feature-otrsticketacleditor-mab-master

commit 8c65b633819fa0ce8d82c81d5e6de82e9d117a6e
Merge: e76a1de 0d8a189
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Mon Jun 17 08:01:14 2013 -0500

    Merge branch 'feature-otrsticketacleditor-mab-master' of git.otrs.com:otrs/otrs into feature-otrsticketacleditor-mab-master

commit 0d8a1898c6ee14974a527a7ee7288d2036887fd4
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Mon Jun 17 13:32:53 2013 +0200

    QA: Fixed issues doubled notifications and JS escapements.

commit dd7be72faf5891009a2688af079d654812e2b0b3
Merge: 4313718 a4607e5
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Mon Jun 17 12:05:02 2013 +0200

    Merge branch 'master' into feature-otrsticketacleditor-mab-master

commit e76a1de7724e8569a9c122715b79b72edaf18be4
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 13:59:40 2013 -0500

    Tidied file.

commit 3650a8a2f410665e239ea6e051154c850971823e
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 13:57:50 2013 -0500

    Tidied file.

commit 43137181fd2f30ece85949f7301d9b87b0fb32b9
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 13:56:10 2013 -0500

    Added return 1 at the end of the file

commit aacdefc89cb91d3bb74e5fdd0914e9657f8e6e71
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 13:53:32 2013 -0500

    Changed SQL strings to fit the OTRS style width.

commit dae68c1a75532425c2715c617144fa5f92c5788e
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 13:44:12 2013 -0500

    Fixed small POD issues.

commit 84085c51fbb4626b88e1df5d20a412fa3240b913
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 13:11:59 2013 -0500

    Fixed DB errors when StopAfterMatch is unchecked (PostgreSQL).

commit 7613b20c49fafe7dc271985acdf18949ae3281ed
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 13:04:31 2013 -0500

    Fixed DB error when trying to create a new ACL and StopAfterMatch is not checked (PostgreSQL).

commit 9c7462763a9b3a55cd2d36970f00cc7e9c66dba7
Merge: 72123bd 172f878
Author: Carlos Rodriguez <carlos.rodriguez@otrs.com>
Date:   Thu Jun 13 12:42:41 2013 -0500

    Merge branch 'master' into feature-otrsticketacleditor-mab-master

commit 72123bd72f8fcaa53fa606c92c3278de3a1aa2d3
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Thu Jun 13 08:51:20 2013 +0200

    Updated to current development state.

commit d2345d6f8d5d3a09fc7f705d6cea7cd06066357a
Author: Marc Bonsels <marc.bonsels@otrs.com>
Date:   Wed Jun 12 19:42:54 2013 +0200

    First version.