Adding bower_components to .gitignore
Adding bower.json

Includes
* Backbone - latest,
* Underscore - latest,
* jQuery - 1.8.3
Adding bespoke folder
Adding core folder

* Contains adapt.js
Adding blank course folder.
Adding vendor libraries
Adding blank css files
Merge pull request #6 from adaptlearning/feature/8257

Feature/8257
Merge feature/8261 into develop

Squashed commit of the following:

commit 86901c6acdfc781b6f1a84514b434546c52a2fcf
Merge: 5aa6861 3888cea
Author: Chris Jones <chrisjones0099@hotmail.com>
Date:   Mon Nov 4 06:31:45 2013 -0800

    Merge pull request #1 from allouis/feature/8261

    Adding conditional loading of scripts/css to app.js

commit 3888cea5d82c2b2cd43032cacbe1067d26f4d3c3
Author: Fabien O'Carroll <fabien@Fabiens-Mac-mini.local>
Date:   Thu Oct 31 11:51:27 2013 +0000

    Adding modernizr to define statement

commit ba1bca3536437fa5ceaedfcaa27062b536ce6f58
Author: Fabien O'Carroll <fabien@Fabiens-Mac-mini.local>
Date:   Thu Oct 31 11:20:59 2013 +0000

    Adding conditional loading of scripts/css to app.js

commit 5aa6861e6455f8ea51d07ce1693b3e5009d04103
Author: Chris Jones <chris.jones@spongeuk.com>
Date:   Wed Oct 30 10:45:44 2013 +0000

    This feature adds the Grunt build process for component, extension, themes and
    menu type plugins.

    The plugin system uses Bower to locate and install the files. All plugins must
    be defined as AMD modules using the define function
    i.e. define(name, deps, factory)

    The following grunt tasks compile the less/css, handlebars into the build
    directory:-

    	grunt-contrib-less
        grunt-contrib-handlebars

    Then there is a custom task to scan for plugins and bundle the into a
    single amd module, this is grunt-requirejs-bundle. This is followed by
    grunt-bower-requirejs, a third party task that inspects bower packages and
    wires-up the packages main js file with requirejs.

    Finally we can run grunt-contrib-requirejs to compile the prepared modules.
Fixing conflicts in develop branch

* 'develop' of github.com:adaptlearning/adapt_framework:
  Adding blank css files
  Adding vendor libraries
  Adding blank course folder.
  Adding core folder
  Adding bespoke folder
  Adding bower.json
  Adding bower_components to .gitignore

Conflicts:
	bower.json
Merging core setup into develop

Squashed commit of the following:

commit 063a45fd3f7bf8a8ccaa3b53dcfaab67f326a1c4
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 26 15:48:28 2013 +0000

    Added a few comments whilst in development

    - Explains what is returned from each method on the adaptModel.js

commit fc76fa09b4da417fbd60723db3c577ca6650a248
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 26 14:27:27 2013 +0000

    Removed console.logs from tests

commit 7b69e20d17e1d8ceb0879cdedc895179b6cf7bde
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 26 14:20:41 2013 +0000

    Updated views to render child views & router

commit 3eafc7d240d80ce42ffb5b4321fccdc43e599ea0
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 26 13:16:02 2013 +0000

    Updated setOnChildren & tests

commit 29fa5b83b1f747e3253455064170f22f22973175
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 25 16:31:38 2013 +0000

    Update to fix component ready and completion status

commit a29cc862ce3d8aba178fec535c4067e3e9c87a1c
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 25 15:40:47 2013 +0000

    Updated tests and defaults on models

commit f66ebe6bfb32073ec2589cbc39487407c453e842
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 22 12:13:18 2013 +0000

    Fixed router test

commit 50537277dc8d159a17b7cf458674cad1f301bd40
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 22 12:09:47 2013 +0000

    Updated tests and router

commit 30f258356cb8d64521672659663a2329b153a911
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 22 10:08:05 2013 +0000

    Updated tests and models

commit 2eae66fb07c002946475963524c22f693c5fe6ad
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Nov 21 09:46:07 2013 +0000

    Updated router and adaptView

commit e00a1829993a8e2fce09b4fac8a5eadf89bcfc0f
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 19 15:02:28 2013 +0000

    Updated gruntfile and setOnChildren

    - Config of gruntfile updated to reflect ‘menu’ and ‘them’ folders.
    - setOnChildren now enables you to pass in options

commit 50e142a611b61d047d990866949d3493ff3c290e
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 15 18:21:33 2013 +0000

    Removed another fake test

commit 161f23ef0892ac5c02f5fd6432379d5dc9e3a1de
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 15 18:19:59 2013 +0000

    Update version

commit fb4a185de5865627df7584c3a725b1301da94d94
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 15 17:01:09 2013 +0000

    Removed folders that shouldn't exist

commit 91e16c162e4dec417881db69273bdc4ef2d5a151
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 15 16:58:02 2013 +0000

    Update to ignore templates file

commit 6c6cf6c66ff83b9cab10b191e568641e507ec963
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 15 15:16:15 2013 +0000

    Fixed bug with registry

commit ed766214ab95536080c964382215f94d917a1801
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 15 15:15:08 2013 +0000

    Revert "Updated to fix adapt-cli requests"

    This reverts commit 390ae68baec3aafa18fcb66bc7b0b5b7846966d7.

commit 390ae68baec3aafa18fcb66bc7b0b5b7846966d7
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 15 13:30:37 2013 +0000

    Updated to fix adapt-cli requests

commit 62e6324d5490759c795c7ea4530fa295563f9336
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Nov 14 16:46:55 2013 +0000

    Added Adapt.register

    - Used to add components to the Adapt.componentStore

commit 65ec1a0422b5e31ebd318bd03f5245811624b634
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Nov 14 08:26:53 2013 +0000

    Updated to remove badly constructed test

commit 90a7aea01e07ce65e18005fd3b3278e00ecaece4
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Nov 13 17:35:28 2013 +0000

    Updated core defaults across models

commit feddfc10830939a3d8c052e92402949e20bff0ad
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Nov 13 13:06:07 2013 +0000

    Added findDescendants & findAncestor

    - Models can now search from page level down to find it's Descendants
    - Models can now search from components up to pages to find it's
    ancestor

commit 7c80db3e0fd58337cdb8e8f10565805ef202d362
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 12 17:40:29 2013 +0000

    Removed fake router test

commit f79397377dc64320426a54abbb29a764540c0562
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 12 17:39:30 2013 +0000

    Updated to include findDescendants

commit 1f143aea070d519bee6913ad0212c9cefa5fa68b
Merge: 2410cbd 15a66e3
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Nov 12 12:46:26 2013 +0000

    Merge branch 'prototype/karma' into feature/8268

    * prototype/karma:
      Updated to remove jasmine and add mocha
      Updated to remove mocha and use jasmine
      Updated to include a second test
      Updated to fix tests
      Updated testing library
      Fixed json file
      Updated travis ci test
      Updated package.json
      Update karma config
      Update to karma config
      Updated tests
      Updated karma config
      Updated json files
      Update json file
      Fixed bug in package.json
      Update to add Karma for testing

commit 15a66e32916c716d3b3a9fe41f03b743a8e0a2d1
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 11 17:41:07 2013 +0000

    Updated to remove jasmine and add mocha

commit d54af2662949641fc386a322ee18de28b02df8de
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 12:30:44 2013 +0000

    Updated to remove mocha and use jasmine

commit 377c3fb4a391bb76421bcd6626ada9d8f0e6061d
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 12:14:33 2013 +0000

    Updated to include a second test

commit 4595811dbd9501984b8a8d49428268bb0f86dc60
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 12:04:05 2013 +0000

    Updated to fix tests

commit fee36b1aa979df2ebfb55b0f71b247481f2b397a
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 11:59:37 2013 +0000

    Updated testing library

commit fb319af7966e91deb0abfd79a6eb97375c2279a6
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 11:13:40 2013 +0000

    Fixed json file

commit 8efe547a48f15399bf149c9f679fb8685a37f5f1
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 11:11:48 2013 +0000

    Updated travis ci test

commit 8fa4a68fadc79f43708baa56b9bc15558672541f
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 11:07:46 2013 +0000

    Updated package.json

commit 8b7b91ecb464cf05758bbd0858941502cd4afc2d
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 10:58:10 2013 +0000

    Update karma config

commit 991fac1d0c08a76a00582517ac9f49d5771797f8
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 10:38:32 2013 +0000

    Update to karma config

commit 9792b9650ce5b85f1681c5e673aa4e505e60f0fc
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 10:23:35 2013 +0000

    Updated tests

commit 78b1b901a1ce979c0ab5da477e6fd5ce557ace0e
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 10:17:55 2013 +0000

    Updated karma config

commit 48dc095bc6019d2aa9e5104f50c7d35943ef0793
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 09:33:15 2013 +0000

    Updated json files

commit 0a38bcd127fbc8c497de4681d27a0934673959a7
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 09:28:06 2013 +0000

    Update json file

commit a1994a6cf583a90e21dfc4a9c15e4fb12d86638d
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 09:24:43 2013 +0000

    Fixed bug in package.json

commit 08b96f027f508c1cca20f41d2f9389a75be39573
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 09:22:46 2013 +0000

    Update to add Karma for testing

commit 2410cbd8e86a129961b5fd7a97db2f4bd0a43773
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Sun Nov 10 08:53:14 2013 +0000

    Added uglify task to requirejs grunt

commit b59ce3e16c18cda5d7744b71a67f0d8d946bb84e
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 8 16:19:42 2013 +0000

    update to test files

commit 5747c0b7777135e3ebd8827a615d22711a7e686b
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 8 15:57:48 2013 +0000

    update to addChildren .each function

commit effbd06094dcd833482424aa0d00d7fc3a7bd26c
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 8 15:39:58 2013 +0000

    update to include test log

commit 76287dee7770793a02c804af7be4ed512a62fc7a
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 8 15:27:45 2013 +0000

    update to include page completion

commit fe9284b40415c0a8559ba967f465d36e73fda05a
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 8 15:04:03 2013 +0000

    Update to complete adapt render to component level

commit ce268b9ee7210ad353596378425ee4e77c4c66a9
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 4 22:30:18 2013 +0000

    Update to bower, models and collections

commit 663929afad0ab4492eb09017747ea71700036191
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 4 22:10:18 2013 +0000

    Update to include main models and collections

commit 9030f48adeb8808b0982d56dfd8bd818cf548bb8
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 4 18:23:33 2013 +0000

    Updated build folder creation

commit bc95be29a8cefe161f7017896eb167ebd7856437
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 4 17:29:04 2013 +0000

    Fix bower registry and updated grunt file to copy files over

commit ff9b3c9cde9181cc79122f304dc36163dca4d310
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Mon Nov 4 16:03:43 2013 +0000

    Added grunt copy, libraries, themes and views

    - Grunt copy to copy over index.html
    - Libraries for our core libraries
    - Adapt theme folder and file structure added
    - Core views folder added
Added base styling
Squashed commit of the following:

commit 09f3d024bd315480b8276df987d6a24e61ab0651
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Nov 27 14:18:48 2013 +0000

    Fixed grunt file for core less files and plugins

    - Now updated to load core less files first then themes, menu,
    components and extensions

commit 0ce001f16b03b4c4b9a3be59e7aebe4a196be5c7
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Nov 27 14:11:56 2013 +0000

    Added feature/8281

    - Updated .css files to .less files
    - Added _layout attribute to components
Updated manager to now be device.js and refactored code

Squashed commit of the following:

commit 866f01dae76c11356ced50976432800e678ad747
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 29 17:22:25 2013 +0000

    Updated device to return when a device changes

    - Still needs more work as the theme isn’t setup
    - Might need to move this into a Backbone Model

commit 871f451c7146bf36092e5859ab5a7e00709d13a0
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 29 16:14:14 2013 +0000

    Added Adapt.screenWidth

    - enables plugins to grab the current screenSize at any point

commit 5b3c076e158e33fa39aec354acc7c0a117185f35
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Nov 29 10:57:55 2013 +0000

    Updated naming to be device

commit ab3cc881422dc4b276f4b66c5d5b04be2c9db5a0
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Nov 28 20:02:49 2013 +0000

    Updated manager

    - Manager created in app.js
    - Manager now adds class of browser version and OS.

commit b95bea72c65542e5d8124cd63e1c1144c8c7bc3a
Merge: e780fdd df94566
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Nov 28 19:49:19 2013 +0000

    Update feature with new develop branch

    Merge branch 'develop' of https://github.com/adaptlearning/adapt_framework into feature/8717

    * 'develop' of https://github.com/adaptlearning/adapt_framework:
      Added base styling Squashed commit of the following:

commit e780fdd67d5ab55145582e8daf974a0c09ffecff
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Nov 28 16:11:33 2013 +0000

    Refactored manager to fit in with core code
Updated bugs and fixed componentView

Squashed commit of the following:

commit 49380b5e780e132999a1c42abcaeb35b0e9b9da2
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 09:28:05 2013 +0000

    Updated template construtor

commit bba0fc018f36f581cf8148b90ce02ca7994fd1e3
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Dec 3 22:37:15 2013 +0000

    Sorted out AdaptModel _isComplete & _isReady

commit 1c4a379ea142dec98bd4adb9e4eff9763d4ea266
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Dec 3 22:28:30 2013 +0000

    Fixed bugs with imageready, componentView and require exports

    - imageready is now exported
    - removed Adapt dependencies from imageready
    - componentView now has blank init and postRender functions
Updated to fix exports/libraries

Squashed commit of the following:

commit 9ab83cc7e6c5e9503042367e9f3030b5ec9078f4
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 11:14:18 2013 +0000

    Updated grunt file

commit b60993f57daf03c187faecec1d13fc2e4a6fb6fd
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 10:54:48 2013 +0000

    Updated config.js from string to array

commit 0ce746a659dbd1bb8b2bf6a12796a734c8d57cd0
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 10:52:45 2013 +0000

    Added exports/libraries to config.js and app.js

commit d630b09a8482e69ae3884b7a76290fddad924c83
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 10:02:12 2013 +0000

    Changed comments

commit 87f23f26a57226add553e15d2dbf97b217bc7846
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 10:00:14 2013 +0000

    Removed console.log

commit c7968ce94ea79e7df9a2949f0a8337de0d038a19
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 09:54:54 2013 +0000

    Updated device to return Adapt.device object
Updated device.js &  support for plugins .less

Squashed commit of the following:

commit 013e1d3b757478c0a82355123d6303cb2a9d33ec
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 13:02:50 2013 +0000

    Updated device.js

commit 4c44614e6fffffa3de67b67f5f56da4883150498
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 12:55:29 2013 +0000

    Updated git ignore to ignore /less folder

commit 808ae10875f5a973d92c44161a1196f0a2a233fc
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 12:54:47 2013 +0000

    Updated grunt file to map .less files

    - Less files are now concatenated into less/adapt.less
    - Less grunt task then takes adapt.less and compiles
Added pageView:ready event

Squashed commit of the following:

commit 46d38c38c903de4c636c092080383207fbe499a3
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Dec 5 11:46:23 2013 +0000

    Merge branch 'develop' of https://github.com/adaptlearning/adapt_framework into feature/8814

    * 'develop' of https://github.com/adaptlearning/adapt_framework:
      Updated device.js &  support for plugins .less

    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

commit 606522839ae19b2c5f1b2725a14d2c5e1eb26d31
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Dec 5 11:43:37 2013 +0000

    Revert "Added comments"

    This reverts commit 8807b52636a8ee6d8fa8653f51bf2b6db6dee961.

commit 8807b52636a8ee6d8fa8653f51bf2b6db6dee961
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Dec 5 11:16:04 2013 +0000

    Added comments

commit 3d09fb3544e4710a6fbdd5d542dd49927c4b662f
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Wed Dec 4 14:25:09 2013 +0000

    Updated page view to trigger 'pageView:ready'
Added IE8 console support

Squashed commit of the following:

commit 574a2b9baaed538382ae08c8281d2401701b6b0c
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Dec 5 12:59:33 2013 +0000

    Updated scriptLoader.js

commit 21c67116437aaf409c1cccbf7a9b288c7202143f
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Dec 5 12:58:57 2013 +0000

    Added IE8 consoles
Fixed pageView:ready trigger in IE and Firefox

Squashed commit of the following:

commit 0793e991d334bdb9e2a85e4beaa334a232e14920
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Fri Dec 6 19:30:00 2013 +0000

    Update to fix Firefox and IE bug
Updated gruntfile to copy over theme assets

Squashed commit of the following:

commit 57ccd69480bbe4e6568ea682632dfae3e475e68d
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Tue Dec 10 15:58:54 2013 +0000

    Updated gruntfile for themes