Squashed commit of the following:

commit 20ee507a2e48908375007686be1ff4475a8c96b4
Merge: 96fab59 a21c240
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 09:36:15 2014 -0800

    Merge pull request #19 from zenduo/develop

    Various style improvements

commit a21c2401ec2bb8dd5f714be5c2a81bc2c2c5ac4b
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Wed Jan 15 13:50:30 2014 +0000

    Style updates to show disabled states

    - Updated to show disabled states
    - Added correct and incorrect colours
    - Given button margin to match the Matching component

commit 96fab59fa11d67a37c9e63d579c4232ca0d8729c
Merge: b9127a9 24ad5fc
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 05:10:43 2014 -0800

    Merge pull request #18 from adaptlearning/issue/17

    Issue/17

commit 24ad5fc38b70f63ca575f765581ffdebc11289a6
Author: Chris Steele <chris.steele@kineo.com>
Date:   Wed Jan 15 11:24:29 2014 +0000

    fixed issue 17

commit 974b87726924394e6e0ff138896b13521ab6c556
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Wed Jan 15 10:04:40 2014 +0000

    Icon colours added

    - Includes new colours from the theme
Squashed commit of the following:

commit 29c3858768b88fa80d3c50df38467a45e728573d
Merge: 20ee507 d8daa08
Author: Chris Jones <cajones@users.noreply.github.com>
Date:   Mon Jan 20 07:22:08 2014 -0800

    Merge pull request #20 from zenduo/develop

    Consistency updates and use of global vars

commit d8daa086f2b8ca0f2796dbb9abdc724de2dd250e
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Thu Jan 16 16:29:52 2014 +0000

    Included global variables to make consistent

commit 0bcd96ac1c770e2455c3af977bccf6946aa76e52
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Thu Jan 16 15:24:01 2014 +0000

    Changed H5/H6 tags to Span for buttons/options

commit 20ee507a2e48908375007686be1ff4475a8c96b4
Merge: 96fab59 a21c240
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 09:36:15 2014 -0800

    Merge pull request #19 from zenduo/develop

    Various style improvements

commit a21c2401ec2bb8dd5f714be5c2a81bc2c2c5ac4b
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Wed Jan 15 13:50:30 2014 +0000

    Style updates to show disabled states

    - Updated to show disabled states
    - Added correct and incorrect colours
    - Given button margin to match the Matching component

commit 96fab59fa11d67a37c9e63d579c4232ca0d8729c
Merge: b9127a9 24ad5fc
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 05:10:43 2014 -0800

    Merge pull request #18 from adaptlearning/issue/17

    Issue/17

commit 24ad5fc38b70f63ca575f765581ffdebc11289a6
Author: Chris Steele <chris.steele@kineo.com>
Date:   Wed Jan 15 11:24:29 2014 +0000

    fixed issue 17

commit 974b87726924394e6e0ff138896b13521ab6c556
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Wed Jan 15 10:04:40 2014 +0000

    Icon colours added

    - Includes new colours from the theme
Conflicts:
	js/adapt-contrib-mcq.js
Merge branch 'master' of https://github.com/adaptlearning/adapt-contrib-mcq into develop

* 'master' of https://github.com/adaptlearning/adapt-contrib-mcq:
  Conflicts: 	js/adapt-contrib-mcq.js
  Squashed commit of the following:
  Squashed commit of the following: