Merge pull request #15 from adaptlearning/develop

Slight change to narrative template
Squashed commit of the following:

commit 33b7d1f8680425785a3a9ead920b6e24776b3dcf
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 16 09:57:41 2014 +0000

    Removed console.log

commit e84b4db5b682ca55e1d8971a2edd9d2d3d64582b
Merge: 7c59d8a e0952bf
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 16 09:55:08 2014 +0000

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

    * 'develop' of https://github.com/adaptlearning/adapt-contrib-narrative:
      Style and Template updates
      Added tests
      Updated tests
      Updated config
      Updated karma config

    Conflicts:
    	js/adapt-contrib-narrative.js

commit e0952bf946bbcb41b7dccdb85591151e02b5b6aa
Merge: 5565a59 22e9184
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 16 01:02:49 2014 -0800

    Merge pull request #21 from zenduo/develop

    Style and Template updates

commit 22e91849c4125c96c555365d1e706cbd6bb8bda6
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Wed Jan 15 21:59:12 2014 +0000

    Style and Template updates

    - Added missing class
    - Added extra styling to theme so it stands out more

commit 7c59d8adfd13ce3a1ea029cd5f0be132f5f7ae70
Author: brian-learningpool <brian@learningpool.com>
Date:   Wed Jan 15 14:29:32 2014 +0000

    Re-work to touch event handling (fixes #18)

    Re-factored navigateTouch().

commit 5565a593b3e25a7ad47d59c223a624e95462b917
Merge: 7e5e60a 7b8fc67
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 06:27:30 2014 -0800

    Merge pull request #19 from adaptlearning/issue/#16

    Issue/#16

commit 7b8fc67fb097211bd8f2169e5623e766b46517b6
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 14:01:02 2014 +0000

    Added tests

commit c375203c78c108a0eeb978b4bd7cd0d90ad15d81
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 13:08:36 2014 +0000

    Updated tests

commit 3a950fcab2c209d85d65fad41f8e3d9aac757747
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 12:50:49 2014 +0000

    Updated config

commit 6034803eae9a31590b962f3ede28dfeb482bd576
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 12:40:58 2014 +0000

    Updated karma config

commit 452692f7a2973a77c68cfd9a8ed30ad036359c40
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 09:20:56 2014 +0000

    Updated maintainers

commit f014b7186d01604bf0d44dd037ac6f69c0cab246
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Jan 15 08:50:24 2014 +0000

    Updated functions removing hide and show and removed unused less

commit d130d8e79afdfc6521cd3cfc0013fc597f0d61da
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Jan 14 23:07:24 2014 +0000

    Refactored narrative

commit 6f5d7e9690002eaa73987b63f2208e8f69336b46
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Jan 14 20:15:08 2014 +0000

    Updated classes

commit b9f0a683be12afd94a2024baec45951b1f41382f
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Jan 14 17:48:40 2014 +0000

    Started refactor of narrative
Conflicts:
	js/adapt-contrib-narrative.js
	templates/narrative.hbs
Forgot to save file with conflict
Conflicts:
	js/adapt-contrib-narrative.js
Merge branch 'develop'

* develop:
  Removed redundant code
  Resolves #22
  Removed console.log
  Style and Template updates
  Re-work to touch event handling (fixes #18)
  Added tests
  Updated tests
  Updated config
  Updated karma config
  Updated maintainers
  Updated functions removing hide and show and removed unused less
  Refactored narrative
  Updated classes
  Started refactor of narrative

Conflicts:
	js/adapt-contrib-narrative.js
Squashed commit of the following:

commit be90e7028e5532af2e41cf42f6d6156fe65e7667
Merge: 4000bac 2596178
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 23 01:50:47 2014 -0800

    Merge pull request #24 from adaptlearning/issue/17

    Fix for issue #17

commit 2596178ba052689cae2c2be617a31d9fd63e1d3a
Author: Kevin Corry <kevinc@learningpool.com>
Date:   Thu Jan 23 08:52:41 2014 +0000

    Removing redundant logic

commit e9c4fc698b7ab7632777dac6825ff6cb2fd7c698
Author: Kevin Corry <kevinc@learningpool.com>
Date:   Wed Jan 22 15:03:09 2014 +0000

    Fix for issue #17 - switch hotgraphic to narrative on mobile
Merge pull request #25 from adaptlearning/master

Merging develop into master