Pushed develop into master

Squashed commit of the following:

commit 9bd73c9a4c2d62a4ee5d272bf2784d2d0a0f51f8
Merge: 3eaba9e 387fd39
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 2 11:18:00 2014 +0000

    Merge branch 'master' of https://github.com/adaptlearning/adapt-contrib-mcq into develop

    * 'master' of https://github.com/adaptlearning/adapt-contrib-mcq:
      Updated .bowerrc file

commit 3eaba9eacd8aeb134f21a488670b5bd449a7f489
Author: Chris Steele <chris.steele@kineo.com>
Date:   Thu Dec 19 18:07:47 2013 +0000

    name tweaks, reset button availability

commit 4e228a6630e524e683b4823e386b73e8d74a783a
Author: Chris Steele <chris.steele@kineo.com>
Date:   Thu Dec 19 16:32:23 2013 +0000

    Initial commit of basic functionality
Merge branch 'master' of https://github.com/adaptlearning/adapt-contrib-mcq into develop

* 'master' of https://github.com/adaptlearning/adapt-contrib-mcq:
  Pushed develop into master